diff --git a/app/src/main/ic_drawer_logo-web.png b/app/src/main/ic_drawer_logo-web.png
deleted file mode 100644
index 29ff436..0000000
Binary files a/app/src/main/ic_drawer_logo-web.png and /dev/null differ
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
deleted file mode 100644
index 5af0b3f..0000000
Binary files a/app/src/main/ic_launcher-web.png and /dev/null differ
diff --git a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/TimerActivity.java b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/TimerActivity.java
index ba56162..4ed3abb 100644
--- a/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/TimerActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlybreakreminder/activities/TimerActivity.java
@@ -286,7 +286,10 @@ public class TimerActivity extends BaseActivity implements android.support.v4.ap
                 saveCurrentSetDuration();
 
                 ExerciseSet set = getCurrentSelectedExerciseSet();
-                long seconds = set.getExerciseSetTime(this);
+
+                long seconds = 0;
+                if(set != null) seconds = set.getExerciseSetTime(this);
+
                 if(seconds * 1000 > getCurrentSetBreakTime()) {
 
                     showTimeWarningDialog(new DialogInterface.OnClickListener() {
@@ -331,7 +334,12 @@ public class TimerActivity extends BaseActivity implements android.support.v4.ap
                 .putInt(FirstLaunchManager.PREF_BREAK_PICKER_MINUTES, minutesBreakPicker.getValue());
 
         ExerciseSet set = getCurrentSelectedExerciseSet();
-        long seconds = set.getExerciseSetTime(this);
+
+        long seconds = 0;
+        if(set != null) {
+            seconds = set.getExerciseSetTime(this);
+        }
+
         if(seconds * 1000 > getCurrentSetBreakTime()) {
             editor.putLong(PAUSE_TIME, seconds * 1000).apply();
         } else {