Increased standards compliance
Fixed error message for no users.

Also increased standards compliance.