diff --git a/build.gradle b/build.gradle
index 2b6ed72..98f5661 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,9 +18,9 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 apply plugin: 'application'
 
-application {
-    mainClassName = 'greenify.server.Application'
-}
+//application {
+//    mainClassName = 'greenify.server.Application'
+//}
 
 repositories {
     mavenCentral()
diff --git a/src/Client/src/main/java/greenify/client/controller/ExtraActivityController.java b/src/Client/src/main/java/greenify/client/controller/ExtraActivityController.java
index 4582daa..51f128e 100644
--- a/src/Client/src/main/java/greenify/client/controller/ExtraActivityController.java
+++ b/src/Client/src/main/java/greenify/client/controller/ExtraActivityController.java
@@ -221,7 +221,7 @@ public class ExtraActivityController {
             Float footprint = userService.saveFootprint(userService.currentUser.getName());
             controller.updateLeaderboard();
             controller.updateAchievements();
-        } catch (Exception ex) {
+        } catch (InterruptedException ex) {
             System.out.println("continue");
         }
     }
@@ -263,7 +263,7 @@ public class ExtraActivityController {
             Float footprint = userService.saveFootprint(userService.currentUser.getName());
             controller.updateAchievements();
             controller.updateLeaderboard();
-        } catch (Exception ex) {
+        } catch (NullPointerException ex) {
             System.out.println("continue");
         }
     }
@@ -278,7 +278,7 @@ public class ExtraActivityController {
             Float footprint = userService.saveFootprint(userService.currentUser.getName());
             controller.updateAchievements();
             controller.updateLeaderboard();
-        } catch (Exception ex) {
+        } catch (NullPointerException ex) {
             System.out.println("continue");
         }
     }
diff --git a/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java b/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java
index 6774cd9..84937d5 100644
--- a/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java
+++ b/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java
@@ -487,7 +487,7 @@ public class RegisterWindowController {
         }
         try {
             extraActivityController.updateExtras();
-        } catch (Exception ex) {
+        } catch (NullPointerException ex) {
             System.out.println("Continue");
         }
         Float firstFootprint = userService.saveFirstFootprint(userService.currentUser.getName());
diff --git a/src/Client/src/main/java/greenify/client/controller/UserController.java b/src/Client/src/main/java/greenify/client/controller/UserController.java
index 3c27973..ed0ea13 100644
--- a/src/Client/src/main/java/greenify/client/controller/UserController.java
+++ b/src/Client/src/main/java/greenify/client/controller/UserController.java
@@ -2,7 +2,6 @@ package greenify.client.controller;
 
 import greenify.client.Application;
 import greenify.client.rest.UserService;
-import greenify.common.ApplicationException;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
diff --git a/src/Client/src/test/java/FriendTest.java b/src/Client/src/test/java/FriendTest.java
index 7b13fce..69490c6 100644
--- a/src/Client/src/test/java/FriendTest.java
+++ b/src/Client/src/test/java/FriendTest.java
@@ -1,9 +1,9 @@
+import static org.junit.Assert.assertEquals;
+
 import greenify.client.Friend;
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 
-import static org.junit.Assert.*;
-
 public class FriendTest {
     @Test
     public void setAndGetTest() {
diff --git a/src/Client/src/test/java/UserServiceTest.java b/src/Client/src/test/java/UserServiceTest.java
index e121a33..3f71e20 100644
--- a/src/Client/src/test/java/UserServiceTest.java
+++ b/src/Client/src/test/java/UserServiceTest.java
@@ -1,3 +1,6 @@
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import greenify.client.rest.UserService;
 import greenify.common.UserDto;
 import org.junit.Test;
@@ -14,9 +17,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 @RunWith(MockitoJUnitRunner.class)
 public class UserServiceTest {