Meant to and undefined and null check. Add some logging to resurrect