diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Environment.java b/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
index 11515ef..37fcdd2 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
@@ -14,7 +14,6 @@
 
 package com.google.devtools.build.lib.syntax;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -723,11 +722,7 @@
     eventHandler.handle(event);
   }
 
-  /**
-   * @return the (immutable) set of names of all variables defined in this
-   * Environment. Exposed for testing.
-   */
-  @VisibleForTesting
+  /** @return the (immutable) set of names of all variables defined in this Environment. */
   public Set<String> getVariableNames() {
     Set<String> vars = new HashSet<>();
     if (lexicalFrame != null) {
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
index b7c2d59..30b9417 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
@@ -832,15 +832,13 @@
 
   @Override
   void validate(ValidationEnvironment env) throws EvalException {
-    for (Argument.Passed arg : args) {
-      arg.getValue().validate(env);
-    }
-
     if (obj != null) {
       obj.validate(env);
-    } else if (!env.hasSymbolInEnvironment(func.getName())) {
-      throw new EvalException(getLocation(),
-          String.format("function '%s' does not exist", func.getName()));
+    } else {
+      func.validate(env);
+    }
+    for (Argument.Passed arg : args) {
+      arg.getValue().validate(env);
     }
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Identifier.java b/src/main/java/com/google/devtools/build/lib/syntax/Identifier.java
index f953b05..83335e2 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Identifier.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Identifier.java
@@ -17,10 +17,10 @@
 import com.google.devtools.build.lib.syntax.compiler.DebugInfo;
 import com.google.devtools.build.lib.syntax.compiler.Variable.SkylarkVariable;
 import com.google.devtools.build.lib.syntax.compiler.VariableScope;
-
-import net.bytebuddy.implementation.bytecode.ByteCodeAppender;
-
+import com.google.devtools.build.lib.util.SpellChecker;
+import java.util.Set;
 import javax.annotation.Nullable;
+import net.bytebuddy.implementation.bytecode.ByteCodeAppender;
 
 // TODO(bazel-team): for extra performance:
 // (1) intern the strings, so we can use == to compare, and have .equals use the assumption.
@@ -74,7 +74,7 @@
   Object doEval(Environment env) throws EvalException {
     Object value = env.lookup(name);
     if (value == null) {
-      throw createInvalidIdentifierException();
+      throw createInvalidIdentifierException(env.getVariableNames());
     }
     return value;
   }
@@ -87,14 +87,23 @@
   @Override
   void validate(ValidationEnvironment env) throws EvalException {
     if (!env.hasSymbolInEnvironment(name)) {
-      throw createInvalidIdentifierException();
+      throw createInvalidIdentifierException(env.getAllSymbols());
     }
   }
 
-  private EvalException createInvalidIdentifierException() {
-    return name.equals("$error$")
-        ? new EvalException(getLocation(), "contains syntax error(s)", true)
-        : new EvalException(getLocation(), "name '" + name + "' is not defined");
+  private EvalException createInvalidIdentifierException(Set<String> symbols) {
+    if (name.equals("$error$")) {
+      return new EvalException(getLocation(), "contains syntax error(s)", true);
+    }
+
+    String suggestion = SpellChecker.suggest(name, symbols);
+    if (suggestion == null) {
+      suggestion = "";
+    } else {
+      suggestion = " (did you mean '" + suggestion + "'?)";
+    }
+
+    return new EvalException(getLocation(), "name '" + name + "' is not defined" + suggestion);
   }
 
   @Override
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/ValidationEnvironment.java b/src/main/java/com/google/devtools/build/lib/syntax/ValidationEnvironment.java
index 6aa5a7d..b0e766d 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/ValidationEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/ValidationEnvironment.java
@@ -105,6 +105,16 @@
         || (parent != null && topLevel().variables.contains(varname));
   }
 
+  /** Returns the set of all accessible symbols (both local and global) */
+  public Set<String> getAllSymbols() {
+    Set<String> all = new HashSet<>();
+    all.addAll(variables);
+    if (parent != null) {
+      all.addAll(parent.getAllSymbols());
+    }
+    return all;
+  }
+
   private ValidationEnvironment topLevel() {
     return Preconditions.checkNotNull(parent == null ? this : parent);
   }