diff --git a/runtime/jdwp/jdwp_handler.cc b/runtime/jdwp/jdwp_handler.cc
index 4b170ba..5f21098 100644
--- a/runtime/jdwp/jdwp_handler.cc
+++ b/runtime/jdwp/jdwp_handler.cc
@@ -1409,7 +1409,10 @@
 
     size_t width = Dbg::GetTagWidth(reqSigByte);
     uint8_t* ptr = expandBufAddSpace(pReply, width+1);
-    Dbg::GetLocalValue(thread_id, frame_id, slot, reqSigByte, ptr, width);
+    JdwpError error = Dbg::GetLocalValue(thread_id, frame_id, slot, reqSigByte, ptr, width);
+    if (error != ERR_NONE) {
+      return error;
+    }
   }
 
   return ERR_NONE;
@@ -1431,7 +1434,10 @@
     uint64_t value = request.ReadValue(width);
 
     VLOG(jdwp) << "    --> slot " << slot << " " << sigByte << " " << value;
-    Dbg::SetLocalValue(thread_id, frame_id, slot, sigByte, value, width);
+    JdwpError error = Dbg::SetLocalValue(thread_id, frame_id, slot, sigByte, value, width);
+    if (error != ERR_NONE) {
+      return error;
+    }
   }
 
   return ERR_NONE;