Revert "NPE Fix"

This reverts commit bda667df16b8ee70058c036678ca6bfff1ae9f2b.