Yes absolutely, that's a good idea. We need to ensure the right code is shown for the right error case anyway.