Tweak error handling for 'that' command