diff --git a/build/configs/toolchain_afl_i686.cmake b/build/configs/toolchain_afl_i686.cmake
new file mode 100644
index 0000000000..1ca633b878
--- /dev/null
+++ b/build/configs/toolchain_afl_i686.cmake
@@ -0,0 +1,21 @@
+# Copyright 2015 Samsung Electronics Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+include(CMakeForceCompiler)
+
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR x86)
+
+CMAKE_FORCE_C_COMPILER(afl-gcc GNU)
+CMAKE_FORCE_CXX_COMPILER(afl-g++ GNU)
diff --git a/build/configs/toolchain_afl_x86_64.cmake b/build/configs/toolchain_afl_x86_64.cmake
new file mode 100644
index 0000000000..a638f30de0
--- /dev/null
+++ b/build/configs/toolchain_afl_x86_64.cmake
@@ -0,0 +1,23 @@
+# Copyright 2015 Samsung Electronics Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+include(CMakeForceCompiler)
+
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR x86_64)
+
+CMAKE_FORCE_C_COMPILER(afl-gcc GNU)
+CMAKE_FORCE_CXX_COMPILER(afl-g++ GNU)
+
+set(FLAGS_COMMON_ARCH -ffixed-rbp)
diff --git a/jerry-core/jrt/jrt-fatals.cpp b/jerry-core/jrt/jrt-fatals.cpp
index 0b54f89f4b..b4af3acf02 100644
--- a/jerry-core/jrt/jrt-fatals.cpp
+++ b/jerry-core/jrt/jrt-fatals.cpp
@@ -60,7 +60,9 @@ jerry_fatal (jerry_fatal_code_t code) /**< status code */
   }
 #endif /* !JERRY_NDEBUG */
 
-  if (code != 0 && jerry_is_abort_on_fail ())
+  if (code != 0
+      && code != ERR_OUT_OF_MEMORY
+      && jerry_is_abort_on_fail ())
   {
     abort ();
   }