Fix Null pointer
Merge remote-tracking branch 'cortiz/master'