[ThankYou] Add in additional error checking for routes.