Index: core/src/main/java/org/apache/hama/bsp/BSPJobClient.java =================================================================== --- core/src/main/java/org/apache/hama/bsp/BSPJobClient.java (revision 1544764) +++ core/src/main/java/org/apache/hama/bsp/BSPJobClient.java (working copy) @@ -241,7 +241,10 @@ * Close the JobClient. */ public synchronized void close() throws IOException { - RPC.stopProxy(jobSubmitClient); + String masterAdress = this.getConf().get("bsp.master.address"); + if (masterAdress != null && !masterAdress.equals("local")) { + RPC.stopProxy(jobSubmitClient); + } } /**