Check for empty data for add/delete/+async (#5242)

Check for empty data for add/delete/+async (#5242) #786