diff --git a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
index 823cb4a..9edb703 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
@@ -70,29 +70,30 @@ class KitScanActivity : AppCompatActivity() {
 //        }
 
 
-        if (checkHemoCubeKitData()) {
-            try {
+        try {
+            if (checkHemoCubeKitData()) {
                 DataHolder.selectedTest!!.kitSerial =
                     sharedPreference.getString(Constants.KIT_NUMBER, "").toString()
                 moveToNext()
-            } catch (e: NullPointerException) {
-                // Handle the NullPointerException here
-                e.printStackTrace() // You can log the exception for debugging
-                FirebaseCrashlytics.getInstance().recordException(e)
-                val errorMessage = "An error occurred: ${e.message}"
-                val rootView = findViewById<View>(android.R.id.content)
-                Snackbar.make(rootView, errorMessage, Snackbar.LENGTH_LONG).show()
-                // Optionally, show a user-friendly error message to the user
-//                Toast.makeText(applicationContext, "An error occurred", Toast.LENGTH_SHORT).show()
-            }
-        } else {
-            with(sharedPreference.edit()) {
-                putString(Constants.KIT_NUMBER, "")
-                putInt(Constants.KIT_COUNT, 0)
-                putString(Constants.BUFFER_VALUE_1, "")
-                putString(Constants.BUFFER_VALUE_2, "")
-                apply()
+            } else {
+                // Handle the case when checkHemoCubeKitData() returns false
+                with(sharedPreference.edit()) {
+                    putString(Constants.KIT_NUMBER, "")
+                    putInt(Constants.KIT_COUNT, 0)
+                    putString(Constants.BUFFER_VALUE_1, "")
+                    putString(Constants.BUFFER_VALUE_2, "")
+                    apply()
+                }
             }
+        } catch (e: NullPointerException) {
+            // Handle the NullPointerException here
+            e.printStackTrace() // You can log the exception for debugging
+            FirebaseCrashlytics.getInstance().recordException(e)
+            val errorMessage = "An error occurred: ${e.message}"
+            val rootView = findViewById<View>(android.R.id.content)
+            Snackbar.make(rootView, errorMessage, Snackbar.LENGTH_LONG).show()
+            // Optionally, show a user-friendly error message to the user
+            // Toast.makeText(applicationContext, "An error occurred", Toast.LENGTH_SHORT).show()
         }