Revert "this is a NULL pointer practice"

This reverts commit 9ab0013a8bbf9d288635e63de033125df7a11ab8.