@@ -130,7 +130,7 @@ public function preview(Request $request, Script $script)
         $config = json_decode($request->get('config'), true) ?: [];
         $code = $request->get('code');
 
-        TestScript::dispatch($script, $code, $data, $config);
+        TestScript::dispatch($script, $request->user(), $code, $data, $config);
         return ['status' => 'success'];
     }
 
 
@@ -20,6 +20,7 @@ class TestScript implements ShouldQueue
         SerializesModels;
 
     protected $script;
+    protected $current_user;
     protected $code;
     protected $data;
     protected $configuration;
@@ -28,13 +29,15 @@ class TestScript implements ShouldQueue
      * Create a new job instance to execute a script.
      *
      * @param ProcessMaker\Models\Script $script
+     * @param ProcessMaker\Models\User $current_user
      * @param string $code
      * @param array $data
      * @param array $configuration
      */
-    public function __construct($script, $code, array $data, array $configuration)
+    public function __construct(Script $script, User $current_user, $code, array $data, array $configuration)
     {
         $this->script = $script;
+        $this->current_user = $current_user;
         $this->code = $code;
         $this->data = $data;
         $this->configuration = $configuration;
@@ -68,6 +71,6 @@ public function handle()
      */
     private function sendResponse($status, array $response)
     {
-        $this->script->runAsUser->notify(new ScriptResponseNotification($status, $response));
+        $this->current_user->notify(new ScriptResponseNotification($status, $response));
     }
 }
@@ -3,6 +3,7 @@
 namespace ProcessMaker\Models;
 
 use Log;
+use ProcessMaker\Exception\ScriptException;
 use ProcessMaker\Exception\ScriptTimeoutException;
 
 /**
@@ -78,11 +79,10 @@ private function runContainer($image, $command, $parameters, $bindings, $timeout
         if ($returnCode) {
             if ($returnCode == 137) {
                 Log::error('Script timed out');
-            } else {
-                Log::error('Script threw return code ' . $returnCode);
+                throw new ScriptTimeoutException(implode("\n", $output));
             }
-
-            throw new ScriptTimeoutException(implode("\n", $output));
+            Log::error('Script threw return code ' . $returnCode . 'Message: ' . implode("\n", $output));
+            throw new ScriptException(implode("\n", $output));
         }
         $outputs = $this->getOutputFilesContent();
         $this->removeTemporalFiles();
 
@@ -147,11 +147,10 @@ private function startContainer($container, $timeout)
         if ($returnCode) {
             if ($returnCode == 137) {
                 Log::error('Script timed out');
-            } else {
-                Log::error('Script threw return code ' . $returnCode);
+                throw new ScriptTimeoutException(implode("\n", $output));
             }
-
-            throw new ScriptTimeoutException(implode("\n", $output));
+            Log::error('Script threw return code ' . $returnCode);
+            throw new ScriptException(implode("\n", $output));
         }
         return compact('line', 'output', 'returnCode');
     }
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public function preview(Request $request, Script $script)`
`130`	`130`	`$config = json_decode($request->get('config'), true) ?: [];`
`131`	`131`	`$code = $request->get('code');`
`132`	`132`
`133`		`- TestScript::dispatch($script, $code, $data, $config);`
	`133`	`+ TestScript::dispatch($script, $request->user(), $code, $data, $config);`
`134`	`134`	`return ['status' => 'success'];`
`135`	`135`	`}`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -147,11 +147,10 @@ private function startContainer($container, $timeout)`
`147`	`147`	`if ($returnCode) {`
`148`	`148`	`if ($returnCode == 137) {`
`149`	`149`	`Log::error('Script timed out');`
`150`		`- } else {`
`151`		`- Log::error('Script threw return code ' . $returnCode);`
	`150`	`+ throw new ScriptTimeoutException(implode("\n", $output));`
`152`	`151`	`}`
`153`		`-`
`154`		`- throw new ScriptTimeoutException(implode("\n", $output));`
	`152`	`+ Log::error('Script threw return code ' . $returnCode);`
	`153`	`+ throw new ScriptException(implode("\n", $output));`
`155`	`154`	`}`
`156`	`155`	`return compact('line', 'output', 'returnCode');`
`157`	`156`	`}`