Fixup incorrect exception handler

Change-Id: I85fec791f1c6aaee1fccc9508556ec2f828f2456