diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java
index 18e9fdd1b0..7c09e946cd 100644
--- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java
+++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java
@@ -154,6 +154,8 @@ public class AbstractService {
 				if (!okwh)
 					return "Error logging in - warehouse not allowed for this org";
 			}
+			else if (warehouses == null && loginRequest.getWarehouseID() > 0)
+				return "Error logging in - warehouse not allowed for this org";
 
 			String error = login.validateLogin(orglogin);
 			if (error != null && error.length() > 0)