diff --git a/restapi/index.php b/restapi/index.php
index 97a9cf3b2..8f391f6c3 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -1562,24 +1562,20 @@ class RestapiController { /* {{{ */
         }
 
         $document = $dms->getDocument($args['id']);
+        if(!$document)
+            return $response->withJson(array('success'=>false, 'message'=>'No such document', 'data'=>''), 404);
         $category = $dms->getDocumentCategory($args['catid']);
+        if(!$category)
+            return $response->withJson(array('success'=>false, 'message'=>'No such category', 'data'=>''), 404);
 
-        if($document && $category) {
-            if ($document->getAccessMode($userobj, 'removeDocumentCategory') >= M_READWRITE) {
-                $ret = $document->removeCategories(array($category));
-                if ($ret)
-                    return $response->withJson(array('success'=>true, 'message'=>'Deleted category successfully.', 'data'=>''), 200);
-                else
-                    return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>''), 200);
-            } else {
-                return $response->withJson(array('success'=>false, 'message'=>'No access', 'data'=>''), 403);
-            }
+        if ($document->getAccessMode($userobj, 'removeDocumentCategory') >= M_READWRITE) {
+            $ret = $document->removeCategories(array($category));
+            if ($ret)
+                return $response->withJson(array('success'=>true, 'message'=>'Deleted category successfully.', 'data'=>''), 200);
+            else
+                return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>''), 200);
         } else {
-            if(!$document)
-                return $response->withJson(array('success'=>false, 'message'=>'No such document', 'data'=>''), 404);
-            if(!$category)
-                return $response->withJson(array('success'=>false, 'message'=>'No such category', 'data'=>''), 404);
-            return $response->withJson(array('success'=>false, 'message'=>'', 'data'=>''), 500);
+            return $response->withJson(array('success'=>false, 'message'=>'No access', 'data'=>''), 403);
         }
     } /* }}} */