diff --git a/build.xml b/build.xml
index dac1769a6ba..f93b530fa7c 100644
--- a/build.xml
+++ b/build.xml
@@ -28,6 +28,9 @@
   <property name="src.examples" location="${basedir}/src/examples"/>
   <property name="src.webapps" location="${basedir}/src/webapps"/>
 
+  <property name="lib.dir" value="${basedir}/lib"/>
+  <property name="conf.dir" value="${basedir}/conf"/>
+
   <property name="test.output" value="no"/>
   <property name="test.timeout" value="900000"/>
 
@@ -44,6 +47,7 @@
   <property name="test.log.dir" value="${test.build.dir}/logs"/>
   <property name="test.junit.output.format" value="plain"/>
 
+
   <!-- all jars together -->
   <property name="javac.deprecation" value="off"/>
   <property name="javac.debug" value="on"/>
@@ -61,7 +65,8 @@
     <fileset refid="lib.jars"/>
       <fileset dir="${basedir}/lib/jetty-ext/">
         <include name="*jar" />
-      </fileset>
+    </fileset>
+    <pathelement location="${conf.dir}"/>
   </path>
 
   <target name="init">
@@ -195,7 +200,7 @@
        debug="${javac.debug}"> 
     <classpath refid="test.classpath"/> 
     </javac>
-    <jar jarfile="${build.dir}/hadoop-${version}-${name}-test.jar" >
+    <jar jarfile="${build.dir}/hbase-${version}-test.jar" >
       <fileset dir="${build.test}" includes="org/**" />
       <fileset dir="${build.classes}" />
       <fileset dir="${src.test}" includes="**/*.properties" />
diff --git a/src/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/src/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
index 37c492a7829..faf71134f7a 100644
--- a/src/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
+++ b/src/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
@@ -274,6 +274,9 @@ public class LocalHBaseCluster implements HConstants {
     }
     // Need to rewrite address in Configuration if not done already.
     String address = c.get(MASTER_ADDRESS);
+    if (address == null) {
+      throw new NullPointerException("Address is null for " + MASTER_ADDRESS);
+    }
     String port = address.startsWith(LOCAL_COLON)?
       address.substring(LOCAL_COLON.length()):
       Integer.toString(DEFAULT_MASTER_PORT);