Tweak for better error message