Some minor fixes for hotplug error condition.