Fix for nullpointer
Merge pull request #31 from timothymiko/feature-fragment

Fix for nullpointer