diff --git a/library/Director/RestApi/IcingaObjectsHandler.php b/library/Director/RestApi/IcingaObjectsHandler.php
index 5af1c1ea..9e5b593e 100644
--- a/library/Director/RestApi/IcingaObjectsHandler.php
+++ b/library/Director/RestApi/IcingaObjectsHandler.php
@@ -89,7 +89,7 @@ class IcingaObjectsHandler extends RequestHandler
         $resolved = (bool) $params->get('resolved', false);
         $withNull = ! $params->shift('withNull');
         $properties = $params->shift('properties');
-        if (strlen($properties)) {
+        if ($properties !== null && strlen($properties)) {
             $properties = preg_split('/\s*,\s*/', $properties, -1, PREG_SPLIT_NO_EMPTY);
         } else {
             $properties = null;
diff --git a/library/Director/Web/Controller/ObjectsController.php b/library/Director/Web/Controller/ObjectsController.php
index 07610834..67927ebd 100644
--- a/library/Director/Web/Controller/ObjectsController.php
+++ b/library/Director/Web/Controller/ObjectsController.php
@@ -85,7 +85,7 @@ abstract class ObjectsController extends ActionController
             $table->filterObjectType('apply');
         }
         $search = $this->params->get('q');
-        if (\strlen($search) > 0) {
+        if ($search !== null && \strlen($search) > 0) {
             $table->search($search);
         }