Added unique device check (issue #2461)