diff --git a/src/kernel/core/vm/vm.c b/src/kernel/core/vm/vm.c
index 6f69dd0cc3..b580c9f7ff 100755
--- a/src/kernel/core/vm/vm.c
+++ b/src/kernel/core/vm/vm.c
@@ -2217,10 +2217,8 @@ vm_page_fault(addr_t address, addr_t fault_address, bool is_write, bool is_user,
 			release_sem_etc(map->sem, READ_COUNT, 0);
 			vm_put_aspace(aspace);
 #endif
-			if (user_debug_fault_occurred(B_SEGMENT_VIOLATION))
-				kill_team(team_get_current_team_id());
-				// bonefish: ToDo: Shouldn't we send a SIGSEGV instead of
-				// killing the team straight away?
+			if (user_debug_exception_occurred(B_SEGMENT_VIOLATION, SIGSEGV))
+				send_signal(team_get_current_team_id(), SIGSEGV);
 		}
 	}