--- a/SmallSense__CompletionContext.st	Sat Mar 07 10:53:11 2015 +0000
+++ b/SmallSense__CompletionContext.st	Tue Mar 10 10:08:49 2015 +0000
@@ -82,9 +82,15 @@
 language
     "Return a programming language in which to complete. i.e., the language of edited source code"
 
-    ^ self textView editedLanguage
+    | lang |
 
-    "Modified: / 07-03-2015 / 10:38:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    lang := self textView editedLanguage.
+    lang isNil ifTrue:[ 
+        lang := support language.
+    ].
+    ^ lang
+
+    "Modified: / 10-03-2015 / 10:04:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 node