Fix for issue - Couldnot modify device name if its blank