Index: master/ProcessServerShutdown.java =================================================================== --- master/ProcessServerShutdown.java (revision 937217) +++ master/ProcessServerShutdown.java (working copy) @@ -142,10 +142,10 @@ // that happened while the shutdown was being processed. String serverAddress = Bytes.toString(values.getValue(CATALOG_FAMILY, SERVER_QUALIFIER)); - long startCode = - Bytes.toLong(values.getValue(CATALOG_FAMILY, STARTCODE_QUALIFIER)); String serverName = null; if (serverAddress != null && serverAddress.length() > 0) { + long startCode = + Bytes.toLong(values.getValue(CATALOG_FAMILY, STARTCODE_QUALIFIER)); serverName = HServerInfo.getServerName(serverAddress, startCode); } if (serverName == null || !deadServer.equals(serverName)) {