todo
Error; handle more error details

404s in particular were not really supported before