diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java
index 0cc765ae3dfe8addf21da1fce80e68216a3a2d4f..c68ee6a9183b35b69a68c30435fe178850ce66e2 100644
--- a/src/main/java/de/thm/arsnova/controller/SessionController.java
+++ b/src/main/java/de/thm/arsnova/controller/SessionController.java
@@ -105,7 +105,7 @@ public class SessionController extends AbstractController {
 	public final List<Session> getSessions(
 			@RequestParam(value = "ownedonly", defaultValue = "false") final boolean ownedOnly,
 			@RequestParam(value = "visitedonly", defaultValue = "false") final boolean visitedOnly,
-			@RequestParam(value="sortby", defaultValue="name") final String sortby,
+			@RequestParam(value = "sortby", defaultValue = "name") final String sortby,
 			final HttpServletResponse response
 	) {
 		User user = userService.getCurrentUser();
@@ -114,7 +114,6 @@ public class SessionController extends AbstractController {
 		/* TODO: Could @Authorized annotation be used instead of this check? */
 		if (null == user) {
 			response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-			
 			return null;
 		}
 		
@@ -125,12 +124,12 @@ public class SessionController extends AbstractController {
 			sessions = sessionService.getMyVisitedSessions(userService.getCurrentUser());
 		} else {
 			response.setStatus(HttpStatus.NOT_IMPLEMENTED.value());
-			
 			return null;
 		}
 		
 		if (sessions == null || sessions.isEmpty()) {
 			response.setStatus(HttpServletResponse.SC_NO_CONTENT);
+			return null;
 		}
 		
 		if (sortby != null && sortby.equals("shortname")) {
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index d1496a0b7cafe615177f2ecf842fd46316c223b8..b3e53fea94d8dc048bb6cec229da30f47d5409b1 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -650,11 +650,10 @@ public class CouchDBDao implements IDatabaseDao {
 				JSONObject json = results.getJSONArray("rows").optJSONObject(0).optJSONObject("value");
 				loggedIn = (LoggedIn) JSONObject.toBean(json, LoggedIn.class);
 				JSONArray vs = json.optJSONArray("visitedSessions");
-				if(vs != null) {
-					Collection<VisitedSession> visitedSessions = JSONArray.toCollection(vs,
-							VisitedSession.class);
-					loggedIn.setVisitedSessions(new ArrayList<VisitedSession>(visitedSessions));	
-				}				
+				if (vs != null) {
+					Collection<VisitedSession> visitedSessions = JSONArray.toCollection(vs, VisitedSession.class);
+					loggedIn.setVisitedSessions(new ArrayList<VisitedSession>(visitedSessions));
+				}
 			}
 
 			loggedIn.setUser(user.getUsername());
@@ -677,10 +676,9 @@ public class CouchDBDao implements IDatabaseDao {
 
 			LoggedIn l = (LoggedIn) JSONObject.toBean(doc.getJSONObject(), LoggedIn.class);
 			JSONArray vs = doc.getJSONObject().optJSONArray("visitedSessions");
-			if(vs != null) {
-				Collection<VisitedSession> visitedSessions = JSONArray.toCollection(vs,
-						VisitedSession.class);
-				l.setVisitedSessions(new ArrayList<VisitedSession>(visitedSessions));	
+			if (vs != null) {
+				Collection<VisitedSession> visitedSessions = JSONArray.toCollection(vs, VisitedSession.class);
+				l.setVisitedSessions(new ArrayList<VisitedSession>(visitedSessions));
 			}
 			return l;
 		} catch (UnsupportedEncodingException e) {
diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index 8b2ad26a98293bbfdcf0ffe8078c38bfd0402c4c..61a85a0e2ef829a700deebdc03053ca6209796dc 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -64,7 +64,7 @@ public class SessionService implements ISessionService {
 		
 		if (connectorClient != null && session.isCourseSession()) {
 			String courseid = session.getCourseId();
-			if (! connectorClient.getMembership(userService.getCurrentUser().getUsername(), courseid).isMember()) {
+			if (!connectorClient.getMembership(userService.getCurrentUser().getUsername(), courseid).isMember()) {
 				throw new ForbiddenException();
 			}
 		}
@@ -107,7 +107,7 @@ public class SessionService implements ISessionService {
 	@Authenticated
 	public final Session saveSession(final Session session) {
 		if (connectorClient != null && session.getCourseId() != null) {
-			if (! connectorClient.getMembership(
+			if (!connectorClient.getMembership(
 				userService.getCurrentUser().getUsername(), session.getCourseId()).isMember()
 			) {
 				throw new ForbiddenException();
@@ -156,7 +156,7 @@ public class SessionService implements ISessionService {
 		return databaseDao.countActiveUsers(session, since);
 	}
 	
-	public static class SessionNameComperator implements Comparator<Session>, Serializable{
+	public static class SessionNameComperator implements Comparator<Session>, Serializable {
 		private static final long serialVersionUID = 1L;
 
 		@Override