diff --git a/alib2cli/src/command/QuitCommand.h b/alib2cli/src/command/QuitCommand.h
index 89367b1a076cc287282b5880f999db31898b28cc..9d6a0b33ba56ed491de86c59aaa651739024f9b5 100644
--- a/alib2cli/src/command/QuitCommand.h
+++ b/alib2cli/src/command/QuitCommand.h
@@ -3,15 +3,21 @@
 
 #include <command/Command.h>
 #include <environment/Environment.h>
+#include <ast/Statement.h>
 
 namespace cli {
 
 class QuitCommand : public Command {
+	std::shared_ptr < Statement > m_command;
+
 public:
-	QuitCommand ( ) {
+	QuitCommand ( std::shared_ptr < Statement > command ) : m_command ( std::move ( command ) ) {
 	}
 
-	virtual Command::Result run ( Environment & ) const override {
+	virtual Command::Result run ( Environment & environment ) const override {
+		if ( m_command )
+			environment.setResult ( m_command->translateAndEval ( nullptr, environment ) );
+
 		return Command::Result::QUIT;
 	}
 };
diff --git a/alib2cli/src/environment/Environment.h b/alib2cli/src/environment/Environment.h
index 9c82947625b5f109f4ec725a3c2d6ea7bc3b7090..592b99629cf4055ff7857e31558ab9f805ca1bab 100644
--- a/alib2cli/src/environment/Environment.h
+++ b/alib2cli/src/environment/Environment.h
@@ -16,10 +16,11 @@ namespace cli {
 class Environment {
 	ext::map < std::string, std::string > m_bindings;
 	ext::map < std::string, std::shared_ptr < abstraction::OperationAbstraction > > m_variables;
+	std::shared_ptr < abstraction::OperationAbstraction > m_result;
 
 	std::unique_ptr < Environment > m_upper;
 
-	std::shared_ptr < abstraction::OperationAbstraction > getVariableInt ( const std::string & name ) {
+	std::shared_ptr < abstraction::OperationAbstraction > getVariableInt ( const std::string & name ) const {
 		auto res = m_variables.find ( name );
 
 		if ( res != m_variables.end ( ) )
@@ -62,12 +63,12 @@ public:
 		return m_bindings.erase ( name );
 	}
 
-	std::shared_ptr < abstraction::OperationAbstraction > getVariable ( const std::string & name ) {
+	std::shared_ptr < abstraction::OperationAbstraction > getVariable ( const std::string & name ) const {
 		return getVariableInt ( name );
 	}
 
 	template < class T >
-	const T & getVariable ( const std::string & name ) {
+	const T & getVariable ( const std::string & name ) const {
 		std::shared_ptr < abstraction::ValueProvider < const T & > > ptr = std::dynamic_pointer_cast < abstraction::ValueProvider < const T & > > ( getVariableInt ( name ) );
 		if ( ! ptr )
 			throw exception::CommonException ( "Invalid variable type. Requested: " + ext::to_string < T > ( ) + ", actual : " + getVariableInt ( name )->getRuntimeReturnType ( ) );
@@ -87,6 +88,27 @@ public:
 		return m_variables.erase ( name );
 	}
 
+	void setResult ( std::shared_ptr < abstraction::OperationAbstraction > value ) {
+		m_result = std::move ( value );
+	}
+
+	int getResult ( ) const {
+		if ( m_result ) {
+			std::shared_ptr < abstraction::ValueProvider < int > > ptr1 = std::dynamic_pointer_cast < abstraction::ValueProvider < int > > ( m_result );
+			if ( ptr1 )
+				return ptr1->getValue ( false );
+			std::shared_ptr < abstraction::ValueProvider < unsigned > > ptr2 = std::dynamic_pointer_cast < abstraction::ValueProvider < unsigned > > ( m_result );
+			if ( ptr2 )
+				return ptr2->getValue ( false );
+			std::shared_ptr < abstraction::ValueProvider < bool > > ptr3 = std::dynamic_pointer_cast < abstraction::ValueProvider < bool > > ( m_result );
+			if ( ptr3 )
+				return ! ptr3->getValue ( false );
+
+			throw exception::CommonException ( "Invalid result type. Provided: " + m_result->getRuntimeReturnType ( ) );
+		} else {
+			return 0;
+		}
+	}
 };
 
 } /* namespace cli */
diff --git a/alib2cli/src/parser/Parser.cpp b/alib2cli/src/parser/Parser.cpp
index 214b2454362ed2bdbd38aa6ca28fd49c9e41f5cf..104cf25f943e1a074106494b0ee66a27153d4725 100644
--- a/alib2cli/src/parser/Parser.cpp
+++ b/alib2cli/src/parser/Parser.cpp
@@ -306,12 +306,22 @@ std::unique_ptr < Command > Parser::parse ( ) {
 		return std::make_unique < ExecuteCommand > ( res );
 	} else if ( check_nonreserved_kw ( "quit" ) ) {
 		match_nonreserved_kw ( "quit" );
+
+		std::shared_ptr < StatementList > res;
+		if ( ! check ( cli::Lexer::TokenType::EOS ) )
+			res = statement_list ( );
+
 		match ( cli::Lexer::TokenType::EOS );
-		return std::make_unique < QuitCommand > ( );
+		return std::make_unique < QuitCommand > ( res );
 	} else if ( check_nonreserved_kw ( "exit" ) ) {
 		match_nonreserved_kw ( "exit" );
+
+		std::shared_ptr < StatementList > res;
+		if ( ! check ( cli::Lexer::TokenType::EOS ) )
+			res = statement_list ( );
+
 		match ( cli::Lexer::TokenType::EOS );
-		return std::make_unique < QuitCommand > ( );
+		return std::make_unique < QuitCommand > ( res );
 	} else if ( check_nonreserved_kw ( "help" ) ) {
 		match_nonreserved_kw ( "help" );
 		std::unique_ptr < cli::Arg > command = optional_arg ( );
@@ -337,7 +347,7 @@ std::unique_ptr < Command > Parser::parse ( ) {
 		match ( cli::Lexer::TokenType::EOS );
 		return std::make_unique < LoadCommand > ( std::move ( libraryName ) );
 	} else if ( check ( cli::Lexer::TokenType::EOT ) ) {
-		return std::make_unique < QuitCommand > ( );
+		return std::make_unique < QuitCommand > ( nullptr );
 	} else {
 		throw exception::CommonException ( "Mismatched set while expanding parse rule." );
 	}
diff --git a/aql2/src/aql.cpp b/aql2/src/aql.cpp
index 59217b407b13c87145b2e84df73da296b0891c06..08f4554ccae2f362a11658f9c470dd179fed8d3c 100644
--- a/aql2/src/aql.cpp
+++ b/aql2/src/aql.cpp
@@ -106,7 +106,7 @@ int main ( int argc, char * argv[] ) {
 			common::Streams::measure << measurements::results ( ) << std::endl;
 
 		if ( result == cli::Command::Result::QUIT )
-			return 0;
+			return p.getEnvironment ( ).getResult ( );
 		else
 			return 4;
 	} catch ( const exception::CommonException & exception ) {
diff --git a/aql2/src/prompt/Prompt.h b/aql2/src/prompt/Prompt.h
index 091a4e8b8c3d1bbf5a537dee200307523a46a0ce..52b35bf7e4460030484c76d8398a6ed49c87f57e 100644
--- a/aql2/src/prompt/Prompt.h
+++ b/aql2/src/prompt/Prompt.h
@@ -49,6 +49,10 @@ public:
 			return cli::Command::Result::EXCEPTION;
 		}
 	}
+
+	const cli::Environment & getEnvironment ( ) const {
+		return m_environment;
+	}
 };
 
 #endif /* _AQL_PROMPT_H_ */