diff --git a/src/lexer.cpp b/src/lexer.cpp
index c926d31..045b796 100644
--- a/src/lexer.cpp
+++ b/src/lexer.cpp
@@ -73,6 +73,7 @@ bool Lexer::readUnsafeString()
     else
         emit unsafeString(s);
 
+    crlf = 0;
     return true;
 }
 
diff --git a/src/parser.cpp b/src/parser.cpp
index 66525a3..906738f 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -33,11 +33,12 @@ void Parser::readUnsafeString(const QString & value)
         tos().count = value.toInt();
     else
     {
+        Task::Action action = tos().action;
         stack.removeLast();
 
-        if(tos().action == Task::ReadStatus)
+        if(action == Task::ReadStatus)
             emit status(value);
-        else if(tos().action == Task::ReadError)
+        else if(action == Task::ReadError)
         {
             int pos = value.indexOf(' ');
             emit error(value.left(pos), value.right(pos + 1));