Fixed public exception handler