diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index e97af7f22a582074f75b712c827ac832acd6d19e..47ea04ac5a48577dec33266597548f5bab5aa451 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -1071,15 +1071,14 @@ public class CouchDBDao implements IDatabaseDao {
 	
 	public Question getInterposedQuestion(String sessionKey, String documentId) {
 		try {
-			
 			Document document = this.getDatabase().getDocument(documentId);
-			LOGGER.error("bla test" + document.toString());
-			if(document != null) {
-				Question question = (Question) JSONObject.toBean(document.getJSONObject(), Question.class);
-				question.setQuestionType("interposed_question");
-				
-				return question;
+			if (document == null) {
+				LOGGER.error("Document is NULL");
+				return null;
 			}
+			Question question = (Question) JSONObject.toBean(document.getJSONObject(), Question.class);
+			question.setQuestionType("interposed_question");
+			return question;
 		} catch (IOException e) {
 			LOGGER.error("Error while retrieving interposed question", e);
 		}
diff --git a/src/main/java/de/thm/arsnova/services/UserService.java b/src/main/java/de/thm/arsnova/services/UserService.java
index 052a3de313dfd19c09a81ac3a3d57597da6a222d..d4f2660af9ca648e05d15a58e818977c52321396 100644
--- a/src/main/java/de/thm/arsnova/services/UserService.java
+++ b/src/main/java/de/thm/arsnova/services/UserService.java
@@ -134,9 +134,12 @@ public class UserService implements IUserService, InitializingBean, DisposableBe
 
 	@Override
 	public String getSessionForUser(String username) {
-		return user2session.get(username);
+		for (Entry<User, String> entry  : user2session.entrySet()) {
+			if (entry.getKey().getUsername().equals(username)) return entry.getValue();
+		}
+		return null;
 	}
-
+	
 	@Override
 	public void afterPropertiesSet() {
 		try {