diff --git a/picoc.c b/picoc.c
index ac21130..2b95132 100644
--- a/picoc.c
+++ b/picoc.c
@@ -82,7 +82,7 @@ int picoc(char *SourceStr)
     }
 
     PicocExitBuf[40] = 0;
-    setjmp(PicocExitBuf);
+    PicocPlatformSetExitPoint();
     if (PicocExitBuf[40]) {
         printf("Leaving PicoC\n\r");
         PicocCleanup();
diff --git a/platform/library_surveyor.c b/platform/library_surveyor.c
index c620406..283aff2 100644
--- a/platform/library_surveyor.c
+++ b/platform/library_surveyor.c
@@ -851,8 +851,7 @@ void Cautorun (struct ParseState *Parser, struct Value *ReturnValue, struct Valu
         if (getchar(&ch)) {
             if (ch == 0x1B) {  // if ESC found, exit picoC
                 printf("found ESC\r\n");
-                PicocExitBuf[40] = 1;
-                longjmp(PicocExitBuf, 1);
+                PlatformExit(0);
             }
         }
     }