Fixing exception type