diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 515d3e7089f156089abf82ea6ec32300d028bd1b..fa2345703d0b483d4c0e5b6d9833c8b6489f86fa 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -1026,7 +1026,7 @@ public class CouchDBDao implements IDatabaseDao {
 			);
 			ViewResults results = this.getDatabase().view(view);
 			List<Answer> answers = new ArrayList<Answer>();
-			if (results.getResults().isEmpty()) {
+			if (results == null || results.getResults() == null || results.getResults().isEmpty()) {
 				return answers;
 			}
 			for (Document d : results.getResults()) {
diff --git a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
index 37750ff80cbf436768c341d0ff483e2a30e2e9ec..d9212d1341be9c569e0eea34c601712500437ed8 100644
--- a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
+++ b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
@@ -18,7 +18,6 @@
  */
 package de.thm.arsnova.dao;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -274,8 +273,7 @@ public class StubDatabaseDao implements IDatabaseDao {
 	
 	@Override
 	public List<Answer> getMyAnswers(String sessionKey) {
-		// TODO Auto-generated method stub
-		return null;
+		return new ArrayList<Answer>();
 	}
 	
 	@Override
diff --git a/src/test/java/de/thm/arsnova/services/QuestionServiceTest.java b/src/test/java/de/thm/arsnova/services/QuestionServiceTest.java
index 96e81937abb951675eff7769f6301a30db4a638e..a78e67a1749853f061c92849ccc78d53e41a2a21 100644
--- a/src/test/java/de/thm/arsnova/services/QuestionServiceTest.java
+++ b/src/test/java/de/thm/arsnova/services/QuestionServiceTest.java
@@ -101,4 +101,10 @@ public class QuestionServiceTest {
 		
 		assertFalse(theQ.isRead());
 	}
+
+	@Test
+	public void testShouldNotThrowExceptionInMyAnsersCall() {
+		userService.setUserAuthenticated(true);
+		assertNotNull(questionService.getMyAnswers("12345678"));
+	}
 }