Fix for exception raise