CHUKWA-760. Added error message for missing configuration.  (Eric Yang)
diff --git a/CHANGES.txt b/CHANGES.txt
index ce31c88..e184e24 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -44,9 +44,11 @@
 
   BUGS
 
+    CHUKWA-760. Added error message for missing configuration.  (Eric Yang)
+
     CHUKWA-762. Fixed stale test cases.  (Eric Yang)
 
-    CHUKWA-761.  Removed confspell from Chukwa.  (Eric Yang)
+    CHUKWA-761. Removed confspell from Chukwa.  (Eric Yang)
 
     CHUKWA-758. Updated default dashboard to include system metrics.  (Eric Yang)
 
diff --git a/bin/chukwa-config.sh b/bin/chukwa-config.sh
index bf80c80..203541a 100755
--- a/bin/chukwa-config.sh
+++ b/bin/chukwa-config.sh
@@ -79,7 +79,17 @@
 export CURRENT_DATE=`date +%Y%m%d%H%M`
 
 if [ -z "$JAVA_HOME" ] ; then
-  echo ERROR! You forgot to set JAVA_HOME in CHUKWA_CONF_DIR/chukwa-env.sh   
+  echo ERROR: Cannot find JAVA_HOME in CHUKWA_CONF_DIR/chukwa-env.sh   
+fi
+
+if [ -z "$HADOOP_CONF_DIR" ] ; then
+  echo "ERROR: Cannot find Hadoop configuration in HADOOP_CONF_DIR."
+  exit 1
+fi
+
+if [ -z "$HBASE_CONF_DIR" ] ; then
+  echo "ERROR: Cannot find HBase configuration in HBASE_CONF_DIR."
+  exit 1
 fi
 
 CHUKWA_STOP_TIMEOUT=${CHUKWA_STOP_TIMEOUT:-3}