diff --git a/core/src/plugins/access.ajxp_conf/src/RepositoriesManager.php b/core/src/plugins/access.ajxp_conf/src/RepositoriesManager.php
index 1e0888711d..9cee9bcb19 100644
--- a/core/src/plugins/access.ajxp_conf/src/RepositoriesManager.php
+++ b/core/src/plugins/access.ajxp_conf/src/RepositoriesManager.php
@@ -222,6 +222,9 @@ public function repositoriesActions(ServerRequestInterface $requestInterface, Re
 
             case "post_repository":
                 $jsonDataCreateWorkspace = json_decode($httpVars["payload"], true);
+                if ($jsonDataCreateWorkspace === null) {
+                    throw new PydioException("Invalid JSON !!");
+                }
                 if(!isSet($jsonDataCreateWorkspace["isTemplate"])) {
                     $jsonDataCreateWorkspace["isTemplate"] = false;
                 }