Fix for exceptions