diff --git a/app/build.gradle b/app/build.gradle
index 93ff59a8d1b2682fd19c9c6b54fa0442f42218f6..6db8021a5574b9f1a51a454ce50c0ec666fb1584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@ if (versionPropsFile.exists() && versionPropsFile.canRead()) {
     versionProps.load(new FileInputStream(versionPropsFile))
     def runTasks = gradle.startParameter.taskNames
     versionBuild = Integer.valueOf(versionProps['VERSION_BUILD'].toString())
-    if (!runTasks.intersect([':app:assembleBeta', 'assembleBeta', ':app:assembleRelease', 'assembleRelease']).empty) {
+    if (!(runTasks.intersect([':app:assembleBeta', 'assembleBeta', ':app:assembleRelease', 'assembleRelease']).empty)) {
         println "Increasing version number"
         versionBuild = versionBuild + 1
     }
diff --git a/app/src/main/java/de/kuschku/libquassel/client/NetworkManager.java b/app/src/main/java/de/kuschku/libquassel/client/NetworkManager.java
index 5a44a499e1fb493a52ab34d24d65bb6bce95dca6..2d4b90f4b02f83975130b99addbf4d994a9b006c 100644
--- a/app/src/main/java/de/kuschku/libquassel/client/NetworkManager.java
+++ b/app/src/main/java/de/kuschku/libquassel/client/NetworkManager.java
@@ -43,7 +43,7 @@ public class NetworkManager extends Observable {
     private final ObservableSortedList<QNetwork> list = new ObservableSortedList<>(QNetwork.class, new ObservableSortedList.ItemComparator<QNetwork>() {
         @Override
         public int compare(QNetwork o1, QNetwork o2) {
-            return o1.networkName().compareTo(o2.networkName());
+            return o1 == null && o2 == null ? 0 : o1 == null ? 1 : o2 == null ? -1 : o1.networkName().compareTo(o2.networkName());
         }
 
         @Override
@@ -68,7 +68,9 @@ public class NetworkManager extends Observable {
     }
 
     public void createNetwork(@NonNull QNetwork network) {
-        list.remove(networks.get(network.networkId()));
+        QNetwork qNetwork = networks.get(network.networkId());
+        if (list.contains(qNetwork))
+            list.remove(qNetwork);
         networks.put(network.networkId(), network);
         list.add(network);
     }