diff --git a/lib/speller/controls.html b/lib/speller/controls.html
index 868c64e07c6..6f2831af81e 100644
--- a/lib/speller/controls.html
+++ b/lib/speller/controls.html
@@ -55,7 +55,7 @@ function suggText() {
 }
 
 function init_spell() {
-	var controlForm = getElementById('spellcheck');
+	var controlForm = document.getElementById('spellcheck');
 
 	// create a new controlWindow object
  	controlWindowObj = new controlWindow( controlForm );
diff --git a/lib/speller/server-scripts/spellchecker.php b/lib/speller/server-scripts/spellchecker.php
index 841da0346b8..1831184698b 100644
--- a/lib/speller/server-scripts/spellchecker.php
+++ b/lib/speller/server-scripts/spellchecker.php
@@ -2,6 +2,10 @@
     include_once("../../../config.php");
     require_login();
 
+if (empty($CFG->aspellpath)) {
+    error('Spellchecker not configured');
+}
+
 header('Content-type: text/html; charset=utf-8');
 
 // Speller pages script http://spellerpages.sourceforge.net/
@@ -35,9 +39,8 @@ function check_language($cmd) {
 
     global $CFG;
 
-    error_reporting(E_ALL); // for debug, final version shouldn't have this...
     clearstatcache();
-    $current_lang = current_language();
+    $current_lang = str_replace('_utf8', '', current_language());
     $output = '';
 
     if(!($handle = popen($cmd .' dump dicts', 'r'))) {