Add comment
Add safer IRQ disable handling