diff --git a/Services/ReportsRepository/classes/class.ilObjReportBaseGUI.php b/Services/ReportsRepository/classes/class.ilObjReportBaseGUI.php
index b56b16cbfe21..699ea84fb453 100644
--- a/Services/ReportsRepository/classes/class.ilObjReportBaseGUI.php
+++ b/Services/ReportsRepository/classes/class.ilObjReportBaseGUI.php
@@ -21,7 +21,12 @@ protected function afterConstructor() {
 		$this->gAccess = $ilAccess;
 		$this->gTabs = $ilTabs;
 
-		$this->setFilterAction();
+		// TODO: this is crapy. The root cause of this problem is, that the
+		// filter should no need to know about it's action. The _rendering_
+		// of the filter needs to know about the action.
+		if ($this->object !== null) {
+			$this->setFilterAction();
+		}
 
 		$this->order = null;
 		$this->title = null;
@@ -68,7 +73,7 @@ final public function performCommand() {
 				return $this->renderReport();
 				break;
 			default:
-				return $this->renderReport();
+				throw new ilException("Unknown Command '$cmd'.");
 		}
 	}