#632 - Don't bury ServiceExceptions that aren't timeout related
#632 - Add more friendly messaging when a delete fails