--- a/includes/lang.php	Tue Nov 06 13:35:40 2007 -0500
+++ b/includes/lang.php	Tue Nov 06 16:22:43 2007 -0500
@@ -154,7 +154,8 @@
       }
       else
       {
-        $db->_die('lang.php - No strings for language ' . $this->lang_code);
+        if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
+          $db->_die('lang.php - No strings for language ' . $this->lang_code);
       }
     }
   }
@@ -215,6 +216,9 @@
     if ( !file_exists($file) )
       $db->_die('lang.php - can\'t import language file: string file doesn\'t exist');
     
+    if ( $this->lang_id == 0 )
+      $db->_die('lang.php - BUG: trying to perform import when $lang->lang_id == 0');
+    
     $contents = trim(@file_get_contents($file));
     
     if ( empty($contents) )