Don't overwrite more specific error message
Editorial
Replaced checks with simpler less invasive tests.