--- a/mcabber/src/commands.c	Fri Nov 09 20:09:47 2007 +0100
+++ b/mcabber/src/commands.c	Fri Nov 09 23:14:03 2007 +0100
@@ -2973,6 +2973,12 @@
     otr_info
   } op = 0;
 
+  if (!otr_enabled()) {
+    scr_LogPrint(LPRINT_LOGNORM,
+                 "Warning: OTR hasn't been enabled -- command ignored.");
+    return;
+  }
+
   paramlst = split_arg(arg, 3, 0); // subcmd, jid, [key]
   subcmd = *paramlst;
   fjid = *(paramlst+1);
@@ -3097,6 +3103,12 @@
   char *fjid, *policy;
   enum otr_policy p;
 
+  if (!otr_enabled()) {
+    scr_LogPrint(LPRINT_LOGNORM,
+                 "Warning: OTR hasn't been enabled -- command ignored.");
+    return;
+  }
+
   paramlst = split_arg(arg, 2, 0); // [jid|default] policy
   fjid = *paramlst;
   policy = *(paramlst+1);