minor fixed Eclipse (Mars) null check related warnings and errors etc.