diff --git a/app/app.iml b/app/app.iml
index ec88675e..2965c2fb 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -18,7 +18,7 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/free/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/pro/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
@@ -64,14 +64,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/pro/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/pro/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/pro/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testPro/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testPro/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testPro/assets" type="java-test-resource" />
@@ -80,6 +72,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testPro/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testPro/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testPro/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPro/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -163,6 +163,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
diff --git a/app/build.gradle b/app/build.gradle
index 7e409bcb..0ea8a1d4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,18 +41,18 @@ android {
     productFlavors {
         pro {
             applicationId 'com.lgallardo.qbittorrentclientpro'
-            versionName '4.3.9'
+            versionName '4.4.0'
             minSdkVersion 14
             targetSdkVersion 23
-            versionCode 439
+            versionCode 440
             archivesBaseName = "qBittorrentController_v" + versionName
         }
         free {
             applicationId "com.lgallardo.qbittorrentclient"
-            versionName '4.3.9'
+            versionName '4.4.0'
             minSdkVersion 14
             targetSdkVersion 23
-            versionCode 439
+            versionCode 440
         }
     }
 
diff --git a/app/src/main/java/com/lgallardo/qbittorrentclient/MainActivity.java b/app/src/main/java/com/lgallardo/qbittorrentclient/MainActivity.java
index ead524cf..ff46aa52 100644
--- a/app/src/main/java/com/lgallardo/qbittorrentclient/MainActivity.java
+++ b/app/src/main/java/com/lgallardo/qbittorrentclient/MainActivity.java
@@ -3236,12 +3236,13 @@ protected String[] doInBackground(String... params) {
 
 
                 // Validate setLabel for API 10+
-                if(Integer.parseInt(MainActivity.qb_api) >= 10 && "setLabel".equals(params[0])) {
-
-                    params[0] = "setCategory";
-
-                    Log.d("Debug", params[0]);
-
+                try {
+                    if(Integer.parseInt(MainActivity.qb_api) >= 10 && "setLabel".equals(params[0])) {
+                        params[0] = "setCategory";
+                        Log.d("Debug", params[0]);
+                    }
+                } catch (NumberFormatException e) {
+                    Log.e("Debug", e.toString());
                 }
 
 
@@ -3882,19 +3883,18 @@ protected void onPostExecute(Torrent[] result) {
 
                 // Sort by Added on and Completed on
                 if (sortby.equals("AddedOn")) {
-                    if (Integer.parseInt(MainActivity.qb_api) < 10) {
-                        Collections.sort(torrentsFiltered, new TorrentAddedOnComparator(reverse_order));
-                    } else {
+                    if (MainActivity.qb_api == null || Integer.parseInt(MainActivity.qb_api) >= 10) {
                         Collections.sort(torrentsFiltered, new TorrentAddedOnTimestampComparator(reverse_order));
+                    } else {
+                        Collections.sort(torrentsFiltered, new TorrentAddedOnComparator(reverse_order));
                     }
-
                 }
 
                 if (sortby.equals("CompletedOn")) {
-                    if (Integer.parseInt(MainActivity.qb_api) < 10) {
-                        Collections.sort(torrentsFiltered, new TorrentCompletedOnComparator(reverse_order));
-                    } else {
+                    if (MainActivity.qb_api == null || Integer.parseInt(MainActivity.qb_api) >= 10) {
                         Collections.sort(torrentsFiltered, new TorrentCompletedOnTimestampComparator(reverse_order));
+                    } else {
+                        Collections.sort(torrentsFiltered, new TorrentCompletedOnComparator(reverse_order));
                     }
                 }