[bugfix]  Avoid NPE
rollback
[bugfix] Avoid NPE
Merge pull request #91 from gev/develop

[bugfix]  Avoid NPE