Don\'t NPE when no security message is provided.
automerge: 843c1f4

* commit '843c1f42617d09b618c31063656f0fe095ced37b':
  Don't NPE when no security message is provided.