Adopt changes of 0.1.62
Fix potential NPE