diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index d6bb566d..01851350 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -232,8 +232,6 @@ int irq_init(void)
  */
 size_t** irq_handler(struct state *s)
 {
-	size_t** ret = NULL;
-
 	/* This is a blank function pointer */
 	void (*handler) (struct state * s);
 
@@ -279,9 +277,9 @@ size_t** irq_handler(struct state *s)
 leave_handler:
 	// timer interrupt?
 	if ((s->int_no == 32) || (s->int_no == 123))
-		ret = scheduler(); // switch to a new task
+		return scheduler(); // switch to a new task
 	else if ((s->int_no >= 32) && (get_highest_priority() > per_core(current_task)->prio))
-		ret = scheduler();
+		return scheduler();
 
-	return ret;
+	return NULL;
 }
diff --git a/mm/memory.c b/mm/memory.c
index 1c7c89a2..0023466b 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -181,8 +181,10 @@ int mmu_init(void)
 	atomic_int32_sub(&total_available_pages, 1);
 #endif
 	ret = paging_init();
-	if (ret)
+	if (ret) {
+		kprintf("Failed to initialize paging: %d\n", ret);
 		return ret;
+	}
 
 #ifdef CONFIG_MULTIBOOT
 	/*