Fix potential NPE
Version 0.0.3