Adding a device connection error callback mechanism
Fixing a merge conflict