diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Login.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Login.java
index 86a7bcfb0a..d62ef6ab00 100644
--- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Login.java
+++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/Login.java
@@ -167,11 +167,13 @@ public class Login extends TableFixture {
 		KeyNamePair[] clients = login.getClients(m_user, m_password);
 		boolean okclient = false;
 		KeyNamePair selectedClient = null;
-		for (KeyNamePair client : clients) {
-			if (client.getKey() == m_client_id) {
-				okclient = true;
-				selectedClient = client;
-				break;
+		if (clients != null) {
+			for (KeyNamePair client : clients) {
+				if (client.getKey() == m_client_id) {
+					okclient = true;
+					selectedClient = client;
+					break;
+				}
 			}
 		}
 		if (!okclient)