potential NPE fix #1