diff --git a/include/gint/ubc.h b/include/gint/ubc.h
index 97f6371..fa1af78 100644
--- a/include/gint/ubc.h
+++ b/include/gint/ubc.h
@@ -19,8 +19,8 @@ void* ubc_getDBR(void);
    The handler will backup the current CPU state and call ubc_debug_handler(). */
 void ubc_dbh(void);
 /* ubc_debug_handler(): C level UBC debug handler
-   The execution will be redirected to the handler set by the user or the add-in
-   will panic in case no handler has been set. */
+   The execution will be redirected to the handler set by the user or the break
+   will be ignored in case no handler has been set. */
 void ubc_debug_handler(gdb_cpu_state_t* cpu_state);
 /* ubc_set_debug_handler(): Set user debug handler
    Set a custom debug handler that will be called when a break condition from
diff --git a/src/ubc/ubc.c b/src/ubc/ubc.c
index 26b8021..104879d 100644
--- a/src/ubc/ubc.c
+++ b/src/ubc/ubc.c
@@ -111,10 +111,9 @@ void ubc_debug_handler(gdb_cpu_state_t* cpu_state)
 
 	if (ubc_application_debug_handler != NULL) {
 		ubc_application_debug_handler(cpu_state);
-	} else {
-		// TODO : Should we add a custom panic code ?
-		gint_panic(-1);
 	}
+	// For now we will ignore breaks when no debug handler is set
+	// TODO : Should we log or panic when no debug handler is set ?
 }
 
 // TODO : Should we use the struct designed for GDB or make it more generic ?