diff --git a/src/net/java/sip/communicator/plugin/otr/OtrContactMenu.java b/src/net/java/sip/communicator/plugin/otr/OtrContactMenu.java
index c4baeeee3..3129ad785 100644
--- a/src/net/java/sip/communicator/plugin/otr/OtrContactMenu.java
+++ b/src/net/java/sip/communicator/plugin/otr/OtrContactMenu.java
@@ -220,7 +220,8 @@ else if (ACTION_COMMAND_CB_RESET.equals(actionCommand))
     public void contactPolicyChanged(Contact contact)
     {
         // Update the corresponding to the contact menu.
-        if (contact.equals(OtrContactMenu.this.contact))
+        if (OtrContactMenu.this.contact != null &&
+            contact.equals(OtrContactMenu.this.contact.contact))
             setOtrPolicy(OtrActivator.scOtrEngine.getContactPolicy(contact));
     }
 
diff --git a/src/net/java/sip/communicator/plugin/otr/OtrMetaContactButton.java b/src/net/java/sip/communicator/plugin/otr/OtrMetaContactButton.java
index 63741f3f0..253e6e315 100644
--- a/src/net/java/sip/communicator/plugin/otr/OtrMetaContactButton.java
+++ b/src/net/java/sip/communicator/plugin/otr/OtrMetaContactButton.java
@@ -72,7 +72,8 @@ public void sessionStatusChanged(OtrContact otrContact)
     public void contactPolicyChanged(Contact contact)
     {
         // OtrMetaContactButton.this.contact can be null.
-        if (contact.equals(OtrMetaContactButton.this.otrContact.contact))
+        if (OtrMetaContactButton.this.otrContact != null &&
+            contact.equals(OtrMetaContactButton.this.otrContact.contact))
         {
             setPolicy(
                 OtrActivator.scOtrEngine.getContactPolicy(contact));