diff --git a/cardshifter-server/src/main/java/com/cardshifter/server/model/InviteManager.java b/cardshifter-server/src/main/java/com/cardshifter/server/model/InviteManager.java
index 16c8c162..7071d5f4 100644
--- a/cardshifter-server/src/main/java/com/cardshifter/server/model/InviteManager.java
+++ b/cardshifter-server/src/main/java/com/cardshifter/server/model/InviteManager.java
@@ -1,6 +1,7 @@
 package com.cardshifter.server.model;
 
 import com.cardshifter.api.*;
+import com.cardshifter.api.outgoing.*;
 import com.cardshifter.core.game.*;
 import org.apache.log4j.*;
 
@@ -40,6 +41,8 @@ public void createAndSend(ClientIO sender, ClientIO receiver, String gameType) {
         if (invite != null) {
             logger.info("Sending [" + invite + "] to [" + receiver + "]");
             invite.sendInvite(receiver);
+        } else {
+            sender.sendToClient(new ServerErrorMessage("You already have a game invitation open."));
         }
     }
 
diff --git a/cardshifter-server/src/test/java/com/cardshifter/server/main/ServerConnectionTest.java b/cardshifter-server/src/test/java/com/cardshifter/server/main/ServerConnectionTest.java
index f7df1a55..2ee080c1 100644
--- a/cardshifter-server/src/test/java/com/cardshifter/server/main/ServerConnectionTest.java
+++ b/cardshifter-server/src/test/java/com/cardshifter/server/main/ServerConnectionTest.java
@@ -228,11 +228,8 @@ public void testOnlyOneInvite() throws IOException, InterruptedException {
 		client1.await(PlayerConfigMessage.class);
 		client1.await(ChatMessage.class);
 
-		// Don't expect a new game to be started, ensure that no NewGameMessage is sent by
-		// awaiting a request made after the StartGameRequest
 		client1.send(new StartGameRequest(2, getTestMod()));
-		client1.send(new ServerQueryMessage(Request.USERS));
-		client1.await(UserStatusMessage.class);
+		client1.await(ServerErrorMessage.class);
 	}
 	
 }