Per @tomspilman remove unnecessary defensive code. Added asserts to catch problematic null refs should they occur.