More informative errors
Add some more conditions in which a retry is a suitable action