If you make the return changes, then do this first and return. If both errors would be caught this one should be shown (which is how it is done now).