#33 Fix npe