Fix NullPointerException
Merge branch 'master' into issue362