diff --git a/edksetup.sh b/edksetup.sh
index f00154e25abf..64795c48d274 100755
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -33,16 +33,57 @@ function HelpMsg()
   return 1
 }
 
+function SetWorkspace()
+{
+  #
+  # If WORKSPACE is already set, then we can return right now
+  #
+  if [ -n "$WORKSPACE" ]
+  then
+    return 0
+  fi
+
+  if [ ! ${BASH_SOURCE[0]} -ef ./edksetup.sh ]
+  then
+    echo Run this script from the base of your tree.  For example:
+    echo "  cd /Path/To/Edk/Root"
+    echo "  . edksetup.sh"
+    return 1
+  fi
+
+  #
+  # Check for BaseTools/BuildEnv before dirtying the user's environment.
+  #
+  if [ ! -f BaseTools/BuildEnv ] && [ -z "$EDK_TOOLS_PATH" ]
+  then
+    echo BaseTools not found in your tree, and EDK_TOOLS_PATH is not set.
+    echo Please point EDK_TOOLS_PATH at the directory that contains
+    echo the EDK2 BuildEnv script.
+    return 1
+  fi
+
+  #
+  # Set $WORKSPACE
+  #
+  export WORKSPACE=`pwd`
+
+  return 0
+}
+
 function SetupEnv()
 {
   if [ -n "$EDK_TOOLS_PATH" ]
   then
     . $EDK_TOOLS_PATH/BuildEnv $*
-  elif [ -n "$WORKSPACE" ]
+  elif [ -f "$WORKSPACE/BaseTools/BuildEnv" ]
   then
     . $WORKSPACE/BaseTools/BuildEnv $*
   else
-    . BaseTools/BuildEnv $*
+    echo BaseTools not found in your tree, and EDK_TOOLS_PATH is not set.
+    echo Please check that WORKSPACE is not set incorrectly in your
+    echo shell, or point EDK_TOOLS_PATH at the directory that contains
+    echo the EDK2 BuildEnv script.
+    return 1
   fi
 }
 
@@ -56,6 +97,7 @@ function SourceEnv()
   then
     HelpMsg
   else
+    SetWorkspace &&
     SetupEnv "$*"
   fi
 }