diff --git a/jerry-libc/target/darwin/jerry-libc-target.c b/jerry-libc/target/darwin/jerry-libc-target.c
index e09f5a949c..fb096c913f 100644
--- a/jerry-libc/target/darwin/jerry-libc-target.c
+++ b/jerry-libc/target/darwin/jerry-libc-target.c
@@ -33,15 +33,6 @@
 
 LIBC_UNREACHABLE_STUB_FOR (int raise (int sig_no __attr_unused___))
 
-/**
- * Exit program with ERR_SYSCALL if syscall_ret_val is negative
- */
-#define LIBC_EXIT_ON_ERROR(syscall_ret_val) \
-  if ((syscall_ret_val) < 0) \
-{ \
-  libc_fatal ("Syscall", __FILE__, __func__, __LINE__); \
-}
-
 static long int syscall_0 (long int syscall_no);
 static long int syscall_1 (long int syscall_no, long int arg1);
 static long int syscall_2 (long int syscall_no, long int arg1, long int arg2);
@@ -60,11 +51,7 @@ extern long int syscall_3_asm (long int syscall_no, long int arg1, long int arg2
 static __attr_noinline___ long int
 syscall_0 (long int syscall_no) /**< syscall number */
 {
-  long int ret = syscall_0_asm (syscall_no);
-
-  LIBC_EXIT_ON_ERROR (ret);
-
-  return ret;
+  return syscall_0_asm (syscall_no);
 } /* syscall_0 */
 
 /**
@@ -76,11 +63,7 @@ static __attr_noinline___ long int
 syscall_1 (long int syscall_no, /**< syscall number */
            long int arg1) /**< argument */
 {
-  long int ret = syscall_1_asm (syscall_no, arg1);
-
-  LIBC_EXIT_ON_ERROR (ret);
-
-  return ret;
+  return syscall_1_asm (syscall_no, arg1);
 } /* syscall_1 */
 
 /**
@@ -93,11 +76,7 @@ syscall_2 (long int syscall_no, /**< syscall number */
            long int arg1, /**< first argument */
            long int arg2) /**< second argument */
 {
-  long int ret = syscall_2_asm (syscall_no, arg1, arg2);
-
-  LIBC_EXIT_ON_ERROR (ret);
-
-  return ret;
+  return syscall_2_asm (syscall_no, arg1, arg2);
 } /* syscall_2 */
 
 /**
@@ -111,11 +90,7 @@ syscall_3 (long int syscall_no, /**< syscall number */
            long int arg2, /**< second argument */
            long int arg3) /**< third argument */
 {
-  long int ret = syscall_3_asm (syscall_no, arg1, arg2, arg3);
-
-  LIBC_EXIT_ON_ERROR (ret);
-
-  return ret;
+  return syscall_3_asm (syscall_no, arg1, arg2, arg3);
 } /* syscall_3 */
 
 /** Output of character. Writes the character c, cast to an unsigned char, to stdout.  */
diff --git a/jerry-libc/target/linux/jerry-libc-target.c b/jerry-libc/target/linux/jerry-libc-target.c
index 0821136c45..d8202b4373 100644
--- a/jerry-libc/target/linux/jerry-libc-target.c
+++ b/jerry-libc/target/linux/jerry-libc-target.c
@@ -33,15 +33,6 @@
 
 LIBC_UNREACHABLE_STUB_FOR (int raise (int sig_no __attr_unused___))
 
-/**
- * Exit program with ERR_SYSCALL if syscall_ret_val is negative
- */
-#define LIBC_EXIT_ON_ERROR(syscall_ret_val) \
-  if ((syscall_ret_val) < 0) \
-{ \
-  libc_fatal ("Syscall", __FILE__, __func__, __LINE__); \
-}
-
 static long int syscall_0 (long int syscall_no);
 static long int syscall_1 (long int syscall_no, long int arg1);
 static long int syscall_2 (long int syscall_no, long int arg1, long int arg2);
@@ -60,11 +51,7 @@ extern long int syscall_3_asm (long int syscall_no, long int arg1, long int arg2
 static __attr_noinline___ long int
 syscall_0 (long int syscall_no) /**< syscall number */
 {
-  long int ret = syscall_0_asm (syscall_no);
-
-  LIBC_EXIT_ON_ERROR (ret);
-
-  return ret;
+  return syscall_0_asm (syscall_no);
 } /* syscall_0 */
 
 /**
@@ -76,11 +63,7 @@ static __attr_noinline___ long int
 syscall_1 (long int syscall_no, /**< syscall number */
            long int arg1) /**< argument */
 {
-  long int ret = syscall_1_asm (syscall_no, arg1);
-
-  LIBC_EXIT_ON_ERROR (ret);
-
-  return ret;
+  return syscall_1_asm (syscall_no, arg1);
 } /* syscall_1 */
 
 /**
@@ -93,11 +76,7 @@ syscall_2 (long int syscall_no, /**< syscall number */
            long int arg1, /**< first argument */
            long int arg2) /**< second argument */
 {
-  long int ret = syscall_2_asm (syscall_no, arg1, arg2);
-
-  LIBC_EXIT_ON_ERROR (ret);
-
-  return ret;
+  return syscall_2_asm (syscall_no, arg1, arg2);
 } /* syscall_2 */
 
 /**
@@ -111,11 +90,7 @@ syscall_3 (long int syscall_no, /**< syscall number */
            long int arg2, /**< second argument */
            long int arg3) /**< third argument */
 {
-  long int ret = syscall_3_asm (syscall_no, arg1, arg2, arg3);
-
-  LIBC_EXIT_ON_ERROR (ret);
-
-  return ret;
+  return syscall_3_asm (syscall_no, arg1, arg2, arg3);
 } /* syscall_3 */
 
 /** Output of character. Writes the character c, cast to an unsigned char, to stdout.  */
diff --git a/main-unix.c b/main-unix.c
index 7f43e1a84c..4aed6d8ad3 100644
--- a/main-unix.c
+++ b/main-unix.c
@@ -96,7 +96,7 @@ read_sources (const char *script_file_names[],
 
   if (i < files_count)
   {
-    JERRY_ERROR_MSG ("Failed to read script N%d\n", i + 1);
+    JERRY_ERROR_MSG ("Failed to open file: %s\n", script_file_names[i]);
 
     return NULL;
   }