diff --git a/buisnesslogic/src/main/java/com/plannaplan/entities/User.java b/buisnesslogic/src/main/java/com/plannaplan/entities/User.java
index d14411f..8758a24 100755
--- a/buisnesslogic/src/main/java/com/plannaplan/entities/User.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/entities/User.java
@@ -48,8 +48,9 @@ public class User {
     }
 
     public void removeGroup(Long id) {
-	final Groups groupToDelete = this.studentRegisteredGrups.stream().filter(e -> e.getId().equals(id)).findFirst().get();
-	this.studentRegisteredGrups.remove(groupToDelete);
+        final Groups groupToDelete = this.studentRegisteredGrups.stream().filter(e -> e.getId().equals(id)).findFirst()
+                .get();
+        this.studentRegisteredGrups.remove(groupToDelete);
     }
 
     public void claimGroup(Groups group) {
@@ -236,6 +237,9 @@ public class User {
      * @return ranking points [100;500]
      */
     public Integer getRanking() {
+        if (ranking == null) {
+            return 100;
+        }
         return ranking;
     }