Avoid NPE on new zwave device