diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index f6c7518fbd..c546cf0fca 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -298,8 +298,6 @@ class CommandInterpreter
                     $result = new TrackingCommand($user);
                 }
                 break;
-            default:
-                $result = false;
             }
 
             Event::handle('EndInterpretCommand', array($cmd, $arg, $user, &$result));
diff --git a/lib/implugin.php b/lib/implugin.php
index 98fba19911..2da4fa961a 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -402,9 +402,8 @@ abstract class ImPlugin extends Plugin
             $chan = new IMChannel($this);
             $cmd->execute($chan);
             return true;
-        } else {
-            return false;
         }
+        return false;
     }
 
     /**