Merge remote-tracking branch 'gooru/master'
Fixed null pointer exception
Merge remote-tracking branch 'gooru/master'
Fixed null pointer exception
Merge pull request #542 from sheebans/master

Fixed null pointer exception