Make the exceptions better