diff -r -u stlink-20170507.orig/src/gdbserver/gdb-server.c stlink-20170507/src/gdbserver/gdb-server.c
--- stlink-20170507.orig/src/gdbserver/gdb-server.c	2017-04-16 19:02:45.000000000 +0300
+++ stlink-20170507/src/gdbserver/gdb-server.c	2017-05-07 18:16:26.027170807 +0300
@@ -1640,6 +1640,7 @@
                             break;
                         }
                     }
+                    break;
 
                     default:
                         reply = strdup("");
@@ -1662,6 +1663,7 @@
                     case '4' : // remove access watchpoint
                         if(delete_data_watchpoint(sl, addr) < 0) {
                             reply = strdup("E00");
+                            break;
                         } else {
                             reply = strdup("OK");
                             break;