Merge pull request #1 from mosabua/master

test pull
Fix getPrimitiveProperty methods null exception

Check if value is null before returning it. This prevents a null exception error.
Merge pull request #50 from Islandman93/master

Fix getPrimitiveProperty methods null exception