diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
index 8898b88..0c14fff 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
@@ -61,9 +61,7 @@ class HemoCubeFragment : Fragment() {
                 Toast.makeText(
                     requireContext(), "Test Results Uploaded Successfully", Toast.LENGTH_SHORT
                 ).show()
-
                 findNavController().navigate(R.id.action_hemocubeFragment_to_homeFragment)
-
             }
             binding.progressBar.visibility = View.GONE
         }
@@ -163,17 +161,35 @@ class HemoCubeFragment : Fragment() {
                         binding.tvSubtitle4.text = stringData
                     }
 
-                    if (stringData.contains("ERROR")) {
+                    if (stringData.contains("ERROR 500")) {
                         UIUtils.createAlertDialog(requireContext(),
-                            "ERROR",
+                            "BUFFER ERROR",
                             "Do you want to continue with existing buffer",
-                            getString(R.string.no),
+                            getString(R.string.noo),
                             "Yes",
                             object : MyDialogListener {
                                 override fun onClickNegativeButton() {
+
+                                }
+
+                                override fun onClickPositiveButton() {
                                     listenToHemoCube()
                                     startBuffer()
                                 }
+                            }
+                        )
+                    }
+
+                    if (stringData.contains("ERROR 501")) {
+                        UIUtils.createAlertDialog(requireContext(),
+                            "SAMPLE ERROR",
+                            "Do you want to continue with Sample",
+                            getString(R.string.noo),
+                            "Yes",
+                            object : MyDialogListener {
+                                override fun onClickNegativeButton() {
+
+                                }
 
                                 override fun onClickPositiveButton() {
                                     listenToHemoCube()
@@ -183,6 +199,7 @@ class HemoCubeFragment : Fragment() {
                         )
                     }
 
+
                     resultData += fullReadOutput.toString()
                     DataHolder.hemoCubeTestData?.resultData
                     if (stringData.contains("#Sample Completed")) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 577cfa1..2106bca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,6 +44,8 @@
     <string name="please_place">Please place the cuvette containing sample for reference before running</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
+    <string name="noo"></string>
+
 
     <string name="connect">Connect</string>
     <string name="connected">Connected</string>