diff --git a/classes/pluginhandler.php b/classes/pluginhandler.php
index df7058dc..eb859ab3 100644
--- a/classes/pluginhandler.php
+++ b/classes/pluginhandler.php
@@ -9,8 +9,14 @@ class PluginHandler extends Handler_Protected {
 
 		$plugin = $pluginhost->get_plugin($_REQUEST["plugin"]);
 
-		if (method_exists($plugin, $method)) {
-			$plugin->$method();
+		if ($plugin) {
+			if (method_exists($plugin, $method)) {
+				$plugin->$method();
+			} else {
+				print json_encode(array("error" => "METHOD_NOT_FOUND"));
+			}
+		} else {
+			print json_encode(array("error" => "PLUGIN_NOT_FOUND"));
 		}
 	}
 }