Index: src/main/java/org/apache/hadoop/hbase/master/HMaster.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1037089) +++ src/main/java/org/apache/hadoop/hbase/master/HMaster.java (working copy) @@ -557,7 +557,7 @@ } if (this.rpcServer != null) this.rpcServer.stop(); // Clean up and close up shop - this.logCleaner.interrupt(); + if (this.logCleaner!= null) this.logCleaner.interrupt(); if (this.infoServer != null) { LOG.info("Stopping infoServer"); try { Index: src/main/java/org/apache/hadoop/hbase/util/FSUtils.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/util/FSUtils.java (revision 1037089) +++ src/main/java/org/apache/hadoop/hbase/util/FSUtils.java (working copy) @@ -39,6 +39,7 @@ import org.apache.hadoop.io.SequenceFile; import java.io.DataInputStream; +import java.io.EOFException; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -149,6 +150,8 @@ fs.open(versionFile); try { version = DataInputStream.readUTF(s); + } catch (EOFException eof) { + LOG.warn("Version file was empty, odd, will try to set it."); } finally { s.close(); }