avoid possible NPE
fix up version