@codingricky Let's push the null check up one level. Feel free to create a private method to remove the duplication.