check that user id is not empty to generate better error message instead of just EOF
Merge branch 'master' into trans-implementation