Adds missing null checks to shouldBackup methods