diff --git a/CMakeLists.txt b/CMakeLists.txt
index d34e1bf2..19aa9c45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.15)
-project(Argon VERSION 0.5.2)
+project(Argon VERSION 0.6.0)
 
 set(AR_MAJOR ${PROJECT_VERSION_MAJOR})
 set(AR_MINOR ${PROJECT_VERSION_MINOR})
diff --git a/README.md b/README.md
index a88a8cef..f45b21eb 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,8 @@
 </p>
 
 <p align="center">
-    <a href="https://img.shields.io/badge/version-0.5.2--alpha-red">
-      <img src="https://img.shields.io/badge/version-0.5.2--alpha-red" alt="Version 0.5.2-alpha">
+    <a href="https://img.shields.io/badge/version-0.6.0--alpha-red">
+      <img src="https://img.shields.io/badge/version-0.6.0--alpha-red" alt="Version 0.6.0-alpha">
     </a>
     <a href="https://www.apache.org/licenses/LICENSE-2.0">
       <img src="https://img.shields.io/badge/license-apache--2.0-blue" alt="Apache License 2.0">
diff --git a/argon/vm/areval.cpp b/argon/vm/areval.cpp
index fea85c0a..3bf90992 100644
--- a/argon/vm/areval.cpp
+++ b/argon/vm/areval.cpp
@@ -988,8 +988,12 @@ ArObject *argon::vm::Eval(Fiber *fiber) {
                 }
 
                 ErrorFormat(kUndeclaredeError[0], kUndeclaredeError[1], ARGON_RAW_STRING((String *) key));
+
                 Release(key);
 
+                // Prevent crash when using 'trap' keyword with non-existent variables
+                PUSH(nullptr);
+
                 break;
             }
             TARGET_OP(LDITER) {