diff --git a/lib/currentuserdesignaction.php b/lib/currentuserdesignaction.php
index 40502bc776..7c2520cf67 100644
--- a/lib/currentuserdesignaction.php
+++ b/lib/currentuserdesignaction.php
@@ -58,7 +58,10 @@ class CurrentUserDesignAction extends Action
          parent::showStylesheets();
 
          $design = $this->getDesign();
-         $design->showCSS($this);
+
+         if (!empty($design)) {
+             $design->showCSS($this);
+         }
      }
 
     /**
diff --git a/lib/ownerdesignaction.php b/lib/ownerdesignaction.php
index b6b30a6065..424474f429 100644
--- a/lib/ownerdesignaction.php
+++ b/lib/ownerdesignaction.php
@@ -62,7 +62,10 @@ class OwnerDesignAction extends Action {
          parent::showStylesheets();
 
          $design = $this->getDesign();
-         $design->showCSS($this);
+
+         if (!empty($design)) {
+             $design->showCSS($this);
+        }
      }
 
     /**