diff --git a/setup.sh b/setup.sh
index bd290424586f61d96b16aafbf1efb26cd88813bf..278e8e72fc8e5d390aaf23b1efee0b3cc14ded6b 100644
--- a/setup.sh
+++ b/setup.sh
@@ -40,8 +40,12 @@ if [ -z $DM_SUPPORT_DIR ]; then
 fi
 if [ ! -d $DM_SUPPORT_DIR ]; then
     echo "ERROR: $DM_SUPPORT_DIR directory does not exist. Developers should point DM_SUPPORT_DIR to the desired area." 
+    unset DM_SUPPORT
     return 1
+else
+    export DM_GLASSFISH_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH
 fi
+
 export DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
 
 # Add to path only if directory exists.