Expand exception handler to listen to load completion