Change checks and remove '!' in exception message