removed potential null pointer