diff --git a/app/src/processing/app/tools/android/Android.java b/app/src/processing/app/tools/android/Android.java
index 4567d6000..60e6f34fc 100644
--- a/app/src/processing/app/tools/android/Android.java
+++ b/app/src/processing/app/tools/android/Android.java
@@ -128,16 +128,16 @@ public class Android implements Tool {
     }
 
     // The environment variable is king. The preferences.txt entry is a page.
-    String envPath = platform.getenv("ANDROID_SDK");
+    String envPath = checkLegit(platform.getenv("ANDROID_SDK"));
     if (envPath != null) {
       sdkPath = envPath;
-      // Just set the pref, in case it the ANDROID_SDK variable gets
-      // knocked out later. For instance, by that pesky Eclipse,
+      // Set this value in preferences.txt, in case ANDROID_SDK
+      // gets knocked out later. For instance, by that pesky Eclipse,
       // which nukes all env variables when launching from the IDE.
       Preferences.set("android.sdk.path", envPath);
 
     } else {
-      sdkPath = Preferences.get("android.sdk.path");
+      sdkPath = checkLegit(Preferences.get("android.sdk.path"));
 
       if (sdkPath == null) {
         int result = Base.showYesNoQuestion(editor, "Android SDK",
diff --git a/app/src/processing/app/tools/android/Pavarotti.java b/app/src/processing/app/tools/android/Pavarotti.java
index 9b1eb4e3f..762885812 100644
--- a/app/src/processing/app/tools/android/Pavarotti.java
+++ b/app/src/processing/app/tools/android/Pavarotti.java
@@ -3,7 +3,7 @@
 /*
   Part of the Processing project - http://processing.org
 
-  Copyright (c) 2009 Ben Fry and Casey Reas
+  Copyright (c) 2009-10 Ben Fry and Casey Reas
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2