Merge pull request #57 from alerque/devel

Cherry pick commits from hotfix on master
Fixed access to non-existing element
Merge pull request #63 from oliversalzburg/fix-userid

Fixed access to non-existing element, see issue #62.