Change some exceptions to be more appropriate