diff --git a/lib/system/excpt.nim b/lib/system/excpt.nim
index 5b7d4d49fe..72225cf96e 100644
--- a/lib/system/excpt.nim
+++ b/lib/system/excpt.nim
@@ -135,8 +135,9 @@ proc pushCurrentException(e: sink(ref Exception)) {.compilerRtl, inl.} =
   #showErrorMessage2 "A"
 
 proc popCurrentException {.compilerRtl, inl.} =
-  currException = currException.up
-  #showErrorMessage2 "B"
+  if currException != nil:
+    currException = currException.up
+    #showErrorMessage2 "B"
 
 proc popCurrentExceptionEx(id: uint) {.compilerRtl.} =
   discard "only for bootstrapping compatbility"
diff --git a/tests/exception/tsetexceptions.nim b/tests/exception/tsetexceptions.nim
index 557fc1898e..386a6ae4c0 100644
--- a/tests/exception/tsetexceptions.nim
+++ b/tests/exception/tsetexceptions.nim
@@ -6,3 +6,10 @@ let ex = newException(CatchableError, "test")
 setCurrentException(ex)
 doAssert getCurrentException().msg == ex.msg
 doAssert getCurrentExceptionMsg() == ex.msg
+setCurrentException(nil)
+
+try:
+  raise newException(CatchableError, "test2")
+except:
+  setCurrentException(nil)
+doAssert getCurrentException() == nil