fix quality flaw (possible NPE)
fix quality flaw (possible NPE)