Fixes #3925 - Prevent UUID to be removed

Fixes #3925 - Prevent UUID to be removed

See http://www.rudder-project.org/redmine/issues/3925