Made the error case less weird looking