diff --git a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
index 611e0dd28d..2ca584fc7e 100644
--- a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
+++ b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
@@ -145,7 +145,9 @@ public final class AuthenticationHelper
                   // check that the home space node exists - else Guest cannot proceed
                   if (nodeService.exists(guestHomeRef) == false)
                   {
-                     throw new InvalidNodeRefException(guestHomeRef);
+                     // cannot login as Guest as Home is missing - return to login screen
+                     logger.warn("Unable to locate Guest Home space - may have been deleted?");
+                     throw new AuthenticationException("");
                   }
                   user.setHomeSpaceId(guestHomeRef.getId());