Fix possible NullPointerExceptions
Merge pull request #13 from shilad/master

Fix possible NullPointerExceptions