Made the exceptions clearer.