diff --git a/Makefile b/Makefile
index d282153..0ffbde1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-CFLAGS = -Wall -Wextra -ggdb
+CFLAGS = -Wall -Wextra -ggdb -fsanitize=address,undefined
 
 ifeq ($(OS),Windows_NT)
 	LFLAGS = -lws2_32
diff --git a/src/system.c b/src/system.c
index eb3f135..7afb89c 100644
--- a/src/system.c
+++ b/src/system.c
@@ -631,7 +631,7 @@ void update_simulation(void)
                     {
                         Descriptor *peer = handle_to_desc(desc->connection_peer);
                         if (peer == NULL) {
-                            // TODO
+                            assert(0); // TODO
                         }
 
                         if (!data_queue_full(&desc->output_data))