diff --git a/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java
index 136d298..9c671ae 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java
@@ -79,7 +79,11 @@ public class MenuFragment extends BaseFragment {
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if(requestCode == REQUEST_CODE_PRODUCT_PROPERTIES && resultCode == RESULT_OK){
+        if(requestCode == REQUEST_CODE_PRODUCT_PROPERTIES &&
+                resultCode == RESULT_OK &&
+                getActivity() != null &&
+                getActivity() instanceof MainActivity){
+            BaseActivity.currentActivity = (MainActivity)getActivity();
             MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity;
             mainActivity.setCartItemCount();
         }