diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index cf765fde..75b94425 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index 97ed80eb..95d7df16 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {                                  
 
-    def appVersionCode = 36        
-    def appVersionName = '1.0.33'        
+    def appVersionCode = 37
+    def appVersionName = '1.0.34'
 
     signingConfigs {                                  
         release {                                  
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java
index c8f30ff0..43419a88 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java
@@ -108,7 +108,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
 
         ButterKnife.bind(this, mBinding.getRoot());
 
-        mWaterfallToolbar.setRecyclerView(mBinding.accettazioneMainList);
+        if(mWaterfallToolbar != null) mWaterfallToolbar.setRecyclerView(mBinding.accettazioneMainList);
 
         return mBinding.getRoot();
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
index 9a918128..7a61c7d3 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
@@ -78,7 +78,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
         ButterKnife.bind(this, mBindings.getRoot());
 
-        mWaterfallToolbar.setNestedScrollView(mBindings.fragmentMainScrollview);
+        if(mWaterfallToolbar != null) mWaterfallToolbar.setNestedScrollView(mBindings.fragmentMainScrollview);
 
         init();
         return mBindings.getRoot();
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java
index 7b84125c..b14243ed 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java
@@ -100,7 +100,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked<MtbColr> {
         if(mtbColt.get() != null)  {
             initAdapter();
 
-            mAppBarTitle.setText(String.format(mContext.getText(R.string.lu_number_text).toString(), mtbColt.get().getNumCollo()));
+            if(mAppBarTitle != null) mAppBarTitle.setText(String.format(mContext.getText(R.string.lu_number_text).toString(), mtbColt.get().getNumCollo()));
 
             initObservableMtbColr();
         }
diff --git a/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt b/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt
index 296da988..28cae7d8 100644
--- a/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt
+++ b/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt
@@ -54,8 +54,10 @@ open class WaterfallToolbar : androidx.cardview.widget.CardView {
 
     var scrollViewScrollListener : ViewTreeObserver.OnScrollChangedListener = ViewTreeObserver.OnScrollChangedListener {
         // real position must always get updated
-        realPosition.value = scrollView!!.scrollY
-        mutualScrollListenerAction()
+        if(scrollView != null) {
+            realPosition.value = scrollView!!.scrollY
+            mutualScrollListenerAction()
+        }
     }
 
     /**
@@ -69,8 +71,10 @@ open class WaterfallToolbar : androidx.cardview.widget.CardView {
 
     var nestedScrollViewScrollListener : ViewTreeObserver.OnScrollChangedListener = ViewTreeObserver.OnScrollChangedListener {
         // real position must always get updated
-        realPosition.value = nestedScrollView!!.scrollY
-        mutualScrollListenerAction()
+        if(nestedScrollView != null) {
+            realPosition.value = nestedScrollView!!.scrollY
+            mutualScrollListenerAction()
+        }
     }
 
     /**