Fix potential null pointer places