diff --git a/libsrc/webserver/CgiHandler.cpp b/libsrc/webserver/CgiHandler.cpp
index cdf9cbd7..7e5da8d3 100644
--- a/libsrc/webserver/CgiHandler.cpp
+++ b/libsrc/webserver/CgiHandler.cpp
@@ -28,68 +28,54 @@ void CgiHandler::setBaseUrl(const QString& url)
 
 void CgiHandler::exec(const QStringList & args, QtHttpRequest * request, QtHttpReply * reply)
 {
-	try
+	_args = args;
+	_request = request;
+	_reply   = reply;
+
+	if ( _args.at(0) == "cfg_jsonserver" )
 	{
-// 		QByteArray header = reply->getHeader(QtHttpHeader::Host);
-// 		QtHttpRequest::ClientInfo info = request->getClientInfo();
-		_args = args;
-		_request = request;
-		_reply   = reply;
 		cmd_cfg_jsonserver();
-// 		cmd_cfg_set();
-		cmd_runscript();
-		throw 1;
 	}
-	catch(int e)
+	else if ( _args.at(0) == "run" )
 	{
-		if (e != 0) throw 1;
+		cmd_runscript();
+	}
+	else
+	{
+		throw std::runtime_error("CGI command not found");
 	}
 }
 
 void CgiHandler::cmd_cfg_jsonserver()
 {
-	if ( _args.at(0) == "cfg_jsonserver" )
-	{
-		quint16 jsonPort = 19444;
-		// send result as reply
-		_reply->addHeader ("Content-Type", "text/plain" );
-		_reply->appendRawData (QByteArrayLiteral(":") % QString::number(jsonPort).toUtf8() );
-
-		throw 0;
-	}
+	quint16 jsonPort = 19444;
+	// send result as reply
+	_reply->addHeader ("Content-Type", "text/plain" );
+	_reply->appendRawData (QByteArrayLiteral(":") % QString::number(jsonPort).toUtf8() );
 }
 
 void CgiHandler::cmd_runscript()
 {
-	if ( _args.at(0) == "run" )
+	QStringList scriptFilePathList(_args);
+	scriptFilePathList.removeAt(0);
+
+	QString scriptFilePath = scriptFilePathList.join('/');
+	// relative path not allowed
+	if ( scriptFilePath.indexOf("..") >=0 )
 	{
-		QStringList scriptFilePathList(_args);
-		scriptFilePathList.removeAt(0);
-
-		QString scriptFilePath = scriptFilePathList.join('/');
-		// relative path not allowed
-		if (scriptFilePath.indexOf("..") >=0)
-		{
-			Error( _log, "relative path not allowed (%s)", scriptFilePath.toStdString().c_str());
-			throw 1;
-		}
-
-		scriptFilePath = _baseUrl+"/server_scripts/"+scriptFilePath;
-
- 		if (QFile::exists(scriptFilePath) && scriptFilePath.endsWith(".py") )
-		{
-			QtHttpPostData postData = _request->getPostData();
-			QByteArray inputData; // should  be filled with post data
-			QByteArray data = Process::command_exec("python " + scriptFilePath, inputData);
-			_reply->addHeader ("Content-Type", "text/plain");
-			_reply->appendRawData (data);
-			throw 0;
-		}
-		else
-		{
-			Error( _log, "script %s doesn't exists or is no python file", scriptFilePath.toStdString().c_str());
-		}
-
-		throw 1;
+		throw std::runtime_error("[cmd_runscript] Relative path not allowed : %s" + scriptFilePath.toStdString());
 	}
+
+	scriptFilePath = _baseUrl+"/server_scripts/"+scriptFilePath;
+
+	if ( !QFile::exists(scriptFilePath) || !scriptFilePath.endsWith(".py") )
+	{
+		throw std::runtime_error("[cmd_runscript] Script %s doesn't exists or is no python file : " + scriptFilePath.toStdString());
+	}
+
+	QtHttpPostData postData = _request->getPostData();
+	QByteArray inputData; // should  be filled with post data
+	QByteArray data = Process::command_exec("python " + scriptFilePath, inputData);
+	_reply->addHeader ("Content-Type", "text/plain");
+	_reply->appendRawData (data);
 }
diff --git a/libsrc/webserver/CgiHandler.h b/libsrc/webserver/CgiHandler.h
index 3751d107..d096a700 100644
--- a/libsrc/webserver/CgiHandler.h
+++ b/libsrc/webserver/CgiHandler.h
@@ -19,11 +19,11 @@ public:
 	void setBaseUrl(const QString& url);
 	void exec(const QStringList & args,QtHttpRequest * request, QtHttpReply * reply);
 
-	// cgi commands
+private:
+	// CGI commands
 	void cmd_cfg_jsonserver();
 	void cmd_runscript ();
 
-private:
 	QtHttpReply *       _reply;
 	QtHttpRequest *     _request;
 	QStringList         _args;
diff --git a/libsrc/webserver/StaticFileServing.cpp b/libsrc/webserver/StaticFileServing.cpp
index 8d20b98a..898d31d8 100644
--- a/libsrc/webserver/StaticFileServing.cpp
+++ b/libsrc/webserver/StaticFileServing.cpp
@@ -93,11 +93,6 @@ void StaticFileServing::onRequestNeedsReply (QtHttpRequest * request, QtHttpRepl
 				{
 					_cgi.exec(uri_parts, request, reply);
 				}
-				catch(int err)
-				{
-					Error(_log,"Exception while executing cgi %s :  %d", path.toStdString().c_str(), err);
-					printErrorToReply (reply, QtHttpReply::InternalError, "script failed (" % path % ")");
-				}
 				catch(std::exception &e)
 				{
 					Error(_log,"Exception while executing cgi %s :  %s", path.toStdString().c_str(), e.what());