diff --git a/app/src/main/java/de/klaushackner/breathalyzer/MainActivity.java b/app/src/main/java/de/klaushackner/breathalyzer/MainActivity.java
index 4209e5a..d7d07c2 100644
--- a/app/src/main/java/de/klaushackner/breathalyzer/MainActivity.java
+++ b/app/src/main/java/de/klaushackner/breathalyzer/MainActivity.java
@@ -192,6 +192,11 @@ private void updateDrinkList() {
         ArrayList<Drink> depletedDrinks = currentUser.depletedDrinks;
         double totalBac = 0;
 
+        // Converting from Alkomat 3000 v1.9 and older
+        if (depletedDrinks == null) {
+            depletedDrinks = new ArrayList<>();
+        }
+
         if (!drinks.isEmpty()) {
             /*
             If you have 2 items in your list and remove the first one, index 1 is gone and the for each loop throws an
diff --git a/app/src/main/java/de/klaushackner/breathalyzer/User.java b/app/src/main/java/de/klaushackner/breathalyzer/User.java
index 26302ec..1cd190c 100644
--- a/app/src/main/java/de/klaushackner/breathalyzer/User.java
+++ b/app/src/main/java/de/klaushackner/breathalyzer/User.java
@@ -40,8 +40,8 @@ public User(String name, boolean isMale, int age, int weight, int height) {
         this.weight = weight;
         this.height = height;
         this.created = System.currentTimeMillis();
-        this.drinks = new ArrayList<Drink>();
-        this.depletedDrinks = new ArrayList<Drink>();
+        this.drinks = new ArrayList<>();
+        this.depletedDrinks = new ArrayList<>();
     }
 
     public User(JSONObject user) {
@@ -54,7 +54,7 @@ public User(JSONObject user) {
             this.created = user.getLong("created");
 
             JSONArray drinksJSON = user.getJSONArray("drinks");
-            drinks = new ArrayList<Drink>();
+            drinks = new ArrayList<>();
 
             for (int i = 0; i < drinksJSON.length(); i++) {
                 drinks.add(new Drink(drinksJSON.getJSONObject(i), this));
@@ -66,7 +66,7 @@ public User(JSONObject user) {
             if (depletedDrinksJSON == null) {
                 depletedDrinksJSON = new JSONArray();
             } else {
-                depletedDrinks = new ArrayList<Drink>();
+                depletedDrinks = new ArrayList<>();
             }
 
             for (int i = 0; i < depletedDrinksJSON.length(); i++) {