fix NPE
Merge remote-tracking branch 'revolt/revolt2' into revolt2