diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index 20bcd4065..0bb6867fb 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -67,7 +67,7 @@ class DisplayHandler extends Handler
 		$oAddonController = getController('addon');
 		$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
 		if(file_exists($addon_file)) include($addon_file);
-		if($output === false || $output === null)
+		if($output === false || $output === null || $output instanceof Object)
 		{
 			$output = $original_output;
 		}