Fixed failing unit test, made it consistent with rest of error messages. Removed now redundant null check