diff --git a/src/backends/sage/sagecompletionobject.cpp b/src/backends/sage/sagecompletionobject.cpp
index 65cd4a6f..28e96d7e 100644
--- a/src/backends/sage/sagecompletionobject.cpp
+++ b/src/backends/sage/sagecompletionobject.cpp
@@ -1,183 +1,235 @@
 /*
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
     as published by the Free Software Foundation; either version 2
     of the License, or (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA  02110-1301, USA.
 
     ---
     Copyright (C) 2009 Alexander Rieder <alexanderrieder@gmail.com>
  */
 
 #include "sagecompletionobject.h"
 
 #include "sagesession.h"
 #include "sagekeywords.h"
 #include "textresult.h"
 
 #include <QDebug>
 #include <QStack>
 
 SageCompletionObject::SageCompletionObject(const QString& command, int index, SageSession* session) : Cantor::CompletionObject(session)
 {
     setLine(command, index);
     m_expression=nullptr;
 }
 
 SageCompletionObject::~SageCompletionObject()
 {
     if(m_expression)
     {
         m_expression->interrupt();
         m_expression->deleteLater();
     }
 }
 
 void SageCompletionObject::fetchCompletions()
 {
-    if (m_expression)
-        return;
+    if (session()->status() == Cantor::Session::Disable)
+    {
+        QStringList allCompletions;
+
+        allCompletions << SageKeywords::instance()->keywords();
+        allCompletions << SageKeywords::instance()->functions();
+        allCompletions << SageKeywords::instance()->variables();
 
-    //cache the value of the "_" variable into __hist_tmp__, so we can restore the previous result
-    //after complete() was evaluated
-    const QString& cmd = QLatin1String("__hist_tmp__=_; __CANTOR_IPYTHON_SHELL__.complete(\"")+command()+QLatin1String("\");_=__hist_tmp__");
-    m_expression=session()->evaluateExpression(cmd, Cantor::Expression::FinishingBehavior::DoNotDelete, true);
-    connect(m_expression, &Cantor::Expression::gotResult, this, &SageCompletionObject::extractCompletions);
+        setCompletions(allCompletions);
+        emit fetchingDone();
+    }
+    else
+    {
+        if (m_expression)
+            return;
+
+        //cache the value of the "_" variable into __hist_tmp__, so we can restore the previous result
+        //after complete() was evaluated
+        const QString& cmd = QLatin1String("__hist_tmp__=_; __CANTOR_IPYTHON_SHELL__.complete(\"")+command()+QLatin1String("\");_=__hist_tmp__");
+        m_expression=session()->evaluateExpression(cmd, Cantor::Expression::FinishingBehavior::DoNotDelete, true);
+        connect(m_expression, &Cantor::Expression::gotResult, this, &SageCompletionObject::extractCompletions);
+    }
 }
 
 void SageCompletionObject::extractCompletions()
 {
   SageSession* s=qobject_cast<SageSession*>(session());
   if(s&&s->sageVersion()<SageSession::VersionInfo(5, 7))
     extractCompletionsLegacy();
   else
     extractCompletionsNew();
 }
 
 void SageCompletionObject::extractCompletionsNew()
 {
     Cantor::Result* res=m_expression->result();
     m_expression->deleteLater();
     m_expression=nullptr;
 
     if(!res || !(res->type()==Cantor::TextResult::Type))
     {
         qDebug()<<"something went wrong fetching tab completion";
+        fetchingDone();
         return;
     }
 
     //the result looks like "['comp1', 'comp2']" parse it
 
     //for sage version 5.7 this looks like
     //('s1', ['comp1','comp2']) where s1 is the string we called complete with
 
     QString txt=res->toHtml().trimmed();
     txt.remove(QLatin1String("<br/>"));
     txt=txt.mid(txt.indexOf(command())+command().length()+2).trimmed();
     txt=txt.mid(1); //remove [
     txt.chop(2); //remove ]
 
     qDebug()<<"completion string: "<<txt;
 
     QStringList tmp=txt.split(QLatin1Char(','));
     QStringList completions;
 
     foreach(QString c, tmp) // krazy:exclude=foreach
     {
         c=c.trimmed();
         c.chop(1);
         completions<<c.mid(2);
     }
 
     completions << SageKeywords::instance()->keywords();
     setCompletions(completions);
 
     emit fetchingDone();
 }
 
 void SageCompletionObject::extractCompletionsLegacy()
 {
     Cantor::Result* res=m_expression->result();
     m_expression->deleteLater();
     m_expression=nullptr;
 
     if(!res || !(res->type()==Cantor::TextResult::Type))
     {
         qDebug()<<"something went wrong fetching tab completion";
+        fetchingDone();
         return;
     }
 
     //the result looks like "['comp1', 'comp2']" parse it
     QString txt=res->toHtml().trimmed();
     txt=txt.mid(1); //remove [
     txt.chop(1); //remove ]
 
     QStringList tmp=txt.split(QLatin1Char(','));
     QStringList completions;
 
     foreach(QString c, tmp) // krazy:exclude=foreach
     {
         c=c.trimmed();
         c.chop(1);
         completions<<c.mid(1);
     }
 
     completions << SageKeywords::instance()->keywords();
     setCompletions(completions);
 
     emit fetchingDone();
 }
 
 
 void SageCompletionObject::fetchIdentifierType()
 {
-    if (m_expression)
-       return;
-    if (SageKeywords::instance()->keywords().contains(identifier())) {
-	emit fetchingTypeDone(KeywordType);
-	return;
+    if (SageKeywords::instance()->keywords().contains(identifier()))
+    {
+        emit fetchingTypeDone(KeywordType);
+        return;
+    }
+
+    if (session()->status() == Cantor::Session::Disable)
+    {
+        if (SageKeywords::instance()->functions().contains(identifier()))
+            emit fetchingTypeDone(FunctionType);
+        else if (SageKeywords::instance()->variables().contains(identifier()))
+            emit fetchingTypeDone(VariableType);
+        else
+            emit fetchingTypeDone(UnknownType);
+    }
+    else
+    {
+        if (m_expression)
+            return;
+
+        QString expr = QString::fromLatin1("__cantor_internal__ = _; type(%1); _ = __cantor_internal__").arg(identifier());
+        m_expression = session()->evaluateExpression(expr, Cantor::Expression::FinishingBehavior::DoNotDelete, true);
+        connect(m_expression, &Cantor::Expression::statusChanged, this, &SageCompletionObject::extractIdentifierType);
     }
-    QString expr = QString::fromLatin1("__cantor_internal__ = _; type(%1); _ = __cantor_internal__").arg(identifier());
-    m_expression = session()->evaluateExpression(expr, Cantor::Expression::FinishingBehavior::DoNotDelete, true);
-    connect(m_expression, &Cantor::Expression::statusChanged, this, &SageCompletionObject::extractIdentifierType);
 }
 
-void SageCompletionObject::extractIdentifierType()
+void SageCompletionObject::extractIdentifierType(Cantor::Expression::Status status)
 {
-    if (m_expression->status() != Cantor::Expression::Done)
-    {
-	m_expression->deleteLater();
-	m_expression = nullptr;
+    if (!m_expression)
         return;
+
+    switch(status)
+    {
+        case Cantor::Expression::Error:
+            qDebug() << "Error with SageCompletionObject" << m_expression->errorMessage();
+            emit fetchingTypeDone(UnknownType);
+            break;
+
+        case Cantor::Expression::Interrupted:
+            qDebug() << "SageCompletionObject was interrupted";
+            emit fetchingTypeDone(UnknownType);
+            break;
+
+        case Cantor::Expression::Done:
+        {
+            Cantor::Result* result = m_expression->result();
+            if (result)
+            {
+                QString res = result->toHtml();
+                if (res.contains(QLatin1String("function")) || res.contains(QLatin1String("method")))
+                    emit fetchingTypeDone(FunctionType);
+                else
+                    emit fetchingTypeDone(VariableType);
+            }
+            else
+                emit fetchingTypeDone(UnknownType);
+            break;
+        }
+
+        default:
+            return;
     }
-    Cantor::Result* result = m_expression->result();
+
     m_expression->deleteLater();
     m_expression = nullptr;
-    if (!result)
-	return;
-
-    QString res = result->toHtml();
-    if (res.contains(QLatin1String("function")) || res.contains(QLatin1String("method")))
-	emit fetchingTypeDone(FunctionType);
-    else
-	emit fetchingTypeDone(VariableType);
+    return;
 }
 
 bool SageCompletionObject::mayIdentifierContain(QChar c) const
 {
     return c.isLetter() || c.isDigit() || c == QLatin1Char('_') || c == QLatin1Char('.');
 }
 
 bool SageCompletionObject::mayIdentifierBeginWith(QChar c) const
 {
     return c.isLetter() || c.isDigit() || c == QLatin1Char('_');
 }
diff --git a/src/backends/sage/sagecompletionobject.h b/src/backends/sage/sagecompletionobject.h
index b63a85dc..9e7adc5f 100644
--- a/src/backends/sage/sagecompletionobject.h
+++ b/src/backends/sage/sagecompletionobject.h
@@ -1,58 +1,55 @@
 /*
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
     as published by the Free Software Foundation; either version 2
     of the License, or (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA  02110-1301, USA.
 
     ---
     Copyright (C) 2009 Alexander Rieder <alexanderrieder@gmail.com>
  */
 
 #ifndef _SAGECOMPLETIONOBJECT_H
 #define _SAGECOMPLETIONOBJECT_H
 
 #include "completionobject.h"
+#include "expression.h"
 
 class SageSession;
 
-namespace Cantor{
-    class Expression;
-}
-
 class SageCompletionObject : public Cantor::CompletionObject
 {
   Q_OBJECT
   public:
     SageCompletionObject( const QString& command, int index, SageSession* session);
     ~SageCompletionObject() override;
 
   protected:
     bool mayIdentifierContain(QChar c) const override;
     bool mayIdentifierBeginWith(QChar c) const override;
 
 
   protected Q_SLOTS:
     void fetchCompletions() override;
     void extractCompletions();
     void fetchIdentifierType() override;
-    void extractIdentifierType();
+    void extractIdentifierType(Cantor::Expression::Status status);
 
  private:
     void extractCompletionsNew();
     void extractCompletionsLegacy();
 
   private:
     Cantor::Expression* m_expression;
 };
 
 #endif /* _SAGECOMPLETIONOBJECT_H */