Add exception handler back into the mix