Fix problem for unknown devices (thanks unit tests)