Before removing entry by identifier check that identifier is not empty