Merge "Set error condition correctly when device is already created."