Better error handling routing