Trying to patch core to remove fiddly error messages