diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m
index 8b5e24447..680f9f6dc 100644
--- a/UI/MainUI/SOGoUserHomePage.m
+++ b/UI/MainUI/SOGoUserHomePage.m
@@ -542,11 +542,18 @@
   id <WOActionResults> result;
   SOGoUserFolder *userFolder;
 
+
   folderType = [self queryParameterForKey: @"type"];
-  userFolder = [self clientObject];
-  folders = [userFolder foldersOfType: folderType
-                               forUID: [userFolder ownerInContext: context]];
-  result = [self _foldersResponseForResults: folders];
+  if ([folderType length])
+    {
+      userFolder = [self clientObject];
+      folders = [userFolder foldersOfType: folderType
+                                   forUID: [userFolder ownerInContext: context]];
+      result = [self _foldersResponseForResults: folders];
+    }
+  else
+    result = [NSException exceptionWithHTTPStatus: 400
+                          reason: @"missing 'type' parameter"];
   
   return result;
 }