Merge pull request #6 from mgeiss/develop

fixed possible NoSuchElementException when retrieving user context