Merge pull request #26 from gamerson/master

Protect against NPE
Check parent content type to find reference container