Fix null point exception
Merge branch 'leon'