#128 Avoided NPE