diff --git a/app/build.gradle b/app/build.gradle
index 5ba6d0b2..67bf86c4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 343
-    def appVersionName = '1.32.03'
+    def appVersionCode = 344
+    def appVersionName = '1.32.04'
 
     signingConfigs {
         release {
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
index 77b77720..cfed6231 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java
@@ -413,16 +413,19 @@ public class SettingsManager {
 
         StbGestSetup value = Stream.of(stbGestSetupList)
                 .filter(x -> x.getSection().equalsIgnoreCase(section) && x.getKeySection().equalsIgnoreCase(keySectionName))
-                .findFirstOrElse(new StbGestSetup());
+                .findFirstOrElse(null);
 
-        if (clazz == String.class) {
-            return clazz.cast(value.getValue());
-        } else if (clazz == Boolean.class) {
-            return clazz.cast("S".equalsIgnoreCase(value.getValue()));
-        } else if (clazz == Integer.class && value.getValue() != null) {
-            return clazz.cast(Integer.parseInt(value.getValue()));
-        } else return defaultValue;
+        if(value != null) {
+            if (clazz == String.class) {
+                return clazz.cast(value.getValue());
+            } else if (clazz == Boolean.class) {
+                return clazz.cast("S".equalsIgnoreCase(value.getValue()));
+            } else if (clazz == Integer.class && value.getValue() != null) {
+                return clazz.cast(Integer.parseInt(value.getValue()));
+            }
+        }
 
+        return defaultValue;
     }
 
 }