Fix null-pointer-exception
Merge remote-tracking branch 'origin/master'