Changing one of the failure messages, and abstracting a duplicated piece of code. Updating version