diff --git a/src/main/java/kiekpad/vizprovider/service/CassandraService.java b/src/main/java/kiekpad/vizprovider/service/CassandraService.java
index 3f454040fdef7f91a8753bf759f237a25f4b3919..53f5077ba8ebcb860eb1b5047ca564a320444df1 100644
--- a/src/main/java/kiekpad/vizprovider/service/CassandraService.java
+++ b/src/main/java/kiekpad/vizprovider/service/CassandraService.java
@@ -4,6 +4,7 @@ import org.springframework.stereotype.Service;
 
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.Session;
+import com.datastax.driver.core.exceptions.InvalidQueryException;
 import com.datastax.driver.core.exceptions.NoHostAvailableException;
 
 @Service
@@ -19,7 +20,7 @@ public class CassandraService {
 		try {
 			final Cluster cluster = Cluster.builder().addContactPoint(IP_ADDRESS).withPort(PORT).build();
 			this.session = cluster.connect(KEYSPACE);
-		} catch (NoHostAvailableException exception) {
+		} catch (NoHostAvailableException | InvalidQueryException exception) {
 			this.session = null;
 		}
 	}