Fixed exception handling variables