Z: bug fix of error checking for unit