better error reporting on empty key fields, fixed empty company on free2work