Merge "Add deferredList null check"