diff --git a/os/hal/ports/SAMA/SAMA5D2x/aic.c b/os/hal/ports/SAMA/SAMA5D2x/aic.c
index e207e579d..08ef03b9d 100644
--- a/os/hal/ports/SAMA/SAMA5D2x/aic.c
+++ b/os/hal/ports/SAMA/SAMA5D2x/aic.c
@@ -86,7 +86,7 @@
 
 static OSAL_IRQ_HANDLER(aicSpuriousHandler) {
   OSAL_IRQ_PROLOGUE();
-  (void)osalSysHalt("Spurious interrupt");
+  osalSysHalt("Spurious interrupt");
   OSAL_IRQ_EPILOGUE();
 }
 
@@ -132,7 +132,7 @@ void aicInit(void) {
     aic->AIC_SMR = AIC_SMR_SRCTYPE(INT_LEVEL_SENSITIVE);
 
     /* Default handler */
-    aic->AIC_SVR = (uint32_t)aicUnexpectedHandler;
+//    aic->AIC_SVR = (uint32_t)aicUnexpectedHandler;
   }
   aicEnableWP(aic);
 }