add the return to fix null pointer