Refactor spec, handle all exceptions in response