Index: src/main/java/com/sun/enterprise/admin/cli/cluster/DeleteLocalInstanceCommand.java =================================================================== --- src/main/java/com/sun/enterprise/admin/cli/cluster/DeleteLocalInstanceCommand.java (revision 43967) +++ src/main/java/com/sun/enterprise/admin/cli/cluster/DeleteLocalInstanceCommand.java (working copy) @@ -146,10 +146,12 @@ */ private void doRemote() throws CommandException { if (isDASRunning()) { - RemoteCommand rc = new RemoteCommand("_unregister-instance", programOpts, env); - rc.execute("_unregister-instance", - "--node", getServerDirs().getServerParentDir().getName(), - getServerDirs().getServerName()); + if (isRegisteredToDas()) { + RemoteCommand rc = new RemoteCommand("_unregister-instance", programOpts, env); + rc.execute("_unregister-instance", + "--node", getServerDirs().getServerParentDir().getName(), + getServerDirs().getServerName()); + } } else { String newString = Strings.get("DeleteInstance.remoteError", programOpts.getHost(), "" + programOpts.getPort()); @@ -165,4 +167,18 @@ return false; } } + + private boolean isRegisteredToDas() { + boolean isRegistered = false; + RemoteCommand rc = null; + String INSTANCE_DOTTED_NAME = "servers.server." + instanceName; + try { + rc = new RemoteCommand("get", this.programOpts, this.env); + rc.executeAndReturnOutput("get", INSTANCE_DOTTED_NAME); + isRegistered = true; + } catch (CommandException ce) { + isRegistered = false; + } + return isRegistered; + } }