diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 05e028a834cf1567bd84761fc0f34727c4fd65ab..a28f11c4652dbcd9d27d41d66622b142b146c1e0 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,8 @@
 $Id$
 
+-- 2010-02-21 version 6.x-2.x-dev
+* #701736 warning after update from fck-editor 6.x-1.4 to fck-editor 6.x-2.0 and update.php
+
 -- 2010-01-31 version 6.x-2.x-dev
 * #678170 Loading fckeditor.config.js from theme path won't always work
 * Tag as version 6.x-2.0
diff --git a/fckeditor.module b/fckeditor.module
index 62bcdfd53df02906ceff12a0de1f4b568d649e93..5217ed727c294d870398d6de60c234d6cbfacfa0 100644
--- a/fckeditor.module
+++ b/fckeditor.module
@@ -1134,10 +1134,15 @@ function fckeditor_get_nodetype($get_q) {
 function fckeditor_path_to_theme() {
 	global $theme_key;
 	static $themepath;
-	
-	if(empty($themepath)) {
-		$themepath = drupal_get_path('theme', $theme_key);
+  
+	if(empty($themepath) && !empty($theme_key)) {
+	  $themepath = drupal_get_path('theme', $theme_key);
 	}
-	
+
+  // fall back
+  if(empty($themepath)) {
+    return path_to_theme();
+  }
+  
 	return $themepath;
 }