diff -up ./breakpoints.c~ ./breakpoints.c
--- ./breakpoints.c~	2012-10-02 17:19:25.965435710 +0200
+++ ./breakpoints.c	2012-10-02 17:25:43.661185565 +0200
@@ -242,19 +244,20 @@ breakpoints_init(Process *proc, int enab
 				}
 			}
 		}
-	}
 
-	struct breakpoint *entry_bp
-		= insert_breakpoint(proc, (void *)(uintptr_t)entry, NULL, 1);
-	if (entry_bp == NULL) {
-		fprintf(stderr, "fail!\n");
-		goto fail;
-	}
+		struct breakpoint *entry_bp
+			= insert_breakpoint(proc, (void *)(uintptr_t)entry,
+					    NULL, 1);
+		if (entry_bp == NULL) {
+			fprintf(stderr, "fail!\n");
+			goto fail;
+		}
 
-	static struct bp_callbacks entry_callbacks = {
-		.on_hit = entry_callback_hit,
-	};
-	entry_bp->cbs = &entry_callbacks;
+		static struct bp_callbacks entry_callbacks = {
+			.on_hit = entry_callback_hit,
+		};
+		entry_bp->cbs = &entry_callbacks;
+	}
 
 	proc->callstack_depth = 0;
 	return 0;