Better error handling, always send a response if we can