Merge branch 'master' into integer-arrays

Author: martin-henz

src/index.ts

@@ -179,7 +179,7 @@ export function runInContext(
         value: sandboxedEval(transpiled)
       } as Result)
     } catch (error) {
-      if (error instanceof RuntimeSourceError) {
+      if (error instanceof RuntimeSourceError || error instanceof ExceptionError) {
         context.errors.push(error)
         return resolvedErrorPromise
       }

src/interpreter.ts

@@ -614,9 +614,10 @@ export function* apply(
         break
       } catch (e) {
         // Recover from exception
-        const globalEnvironment =
-          context.runtime.environments[context.runtime.environments.length - 1]
-        context.runtime.environments = [globalEnvironment]
+        context.runtime.environments = context.runtime.environments.slice(
+          -context.numberOfOuterEnvironments
+        )
+
         const loc = node ? node.loc! : constants.UNKNOWN_LOCATION
         if (!(e instanceof errors.RuntimeSourceError)) {
           // The error could've arisen when the builtin called a source function which errored.