Update version to 0.6.04

+ fix a potential NPE