Took out any NULLifying from code to make sure this isn't the bug.