diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java
index 244dc2ad4..a44d9303d 100644
--- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java
+++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java
@@ -205,12 +205,16 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
 
     @Override
     public void onAttach(Activity activity) {
-        setmJsonApi((JsonApi) activity);
+        if (activity instanceof JsonApi) {
+            setmJsonApi((JsonApi) activity);
+        }
+
         super.onAttach(activity);
-        try {
+
+        if (getActivity() instanceof OnFieldsInvalid) {
             onFieldsInvalid = (OnFieldsInvalid) getActivity();
-        } catch (ClassCastException ex) {
-            throw new ClassCastException("Error retrieving passed invalid fields");
+        } else {
+            Timber.e("Error retrieving passed invalid fields");
         }
     }
 
diff --git a/gradle.properties b/gradle.properties
index 944e04996..12af976b2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1.13.4-SNAPSHOT
+VERSION_NAME=1.13.5-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Native Form Json Wizard