Added small error handling into the request router