Updated to use -@throw- instead of -throw-