diff --git a/src/bin/edi_build_main.c b/src/bin/edi_build_main.c
index d21713f..6ca1a35 100644
--- a/src/bin/edi_build_main.c
+++ b/src/bin/edi_build_main.c
@@ -155,7 +155,8 @@ main(int argc, char **argv)
         goto end;
      }
 
-   getcwd(path, PATH_MAX);
+   if (!getcwd(path, PATH_MAX))
+     goto end;
    edi_project_set(path);
 
    if (args < argc)
diff --git a/src/bin/edi_consolepanel.c b/src/bin/edi_consolepanel.c
index 286b801..49d4878 100644
--- a/src/bin/edi_consolepanel.c
+++ b/src/bin/edi_consolepanel.c
@@ -230,7 +230,9 @@ _edi_test_line_parse_suite(const char *path)
 
    pathlength = strlen(path);
    snprintf(logfile, pathlength + 4 + 1, "%s.log", path);
-   realpath(logfile, logpath);
+   if (!realpath(logfile, logpath))
+     ERR("Log file not found: %s", logfile);
+
    if (_current_test_dir)
      eina_stringshare_del(_current_test_dir);
    _current_test_dir = eina_stringshare_add(dirname(logpath));
diff --git a/src/bin/edi_debugpanel.c b/src/bin/edi_debugpanel.c
index 0b4deb6..e7e4096 100644
--- a/src/bin/edi_debugpanel.c
+++ b/src/bin/edi_debugpanel.c
@@ -209,8 +209,9 @@ _edi_debug_process_id(int *state)
         snprintf(path, sizeof(path), "/proc/%d/cmdline", pid);
         f = fopen(path, "r");
         if (!f) continue;
-        fgets(buf, sizeof(buf), f);
+        p = fgets(buf, sizeof(buf), f);
         fclose(f);
+        if (!p) continue;
         temp_name = ecore_file_file_get(buf);
         if (!strcmp(temp_name, program_name))
           {
@@ -222,8 +223,7 @@ _edi_debug_process_id(int *state)
              if (f)
                {
                   count = 0;
-                  fgets(buf, sizeof(buf), f);
-                  p = buf;
+                  p = fgets(buf, sizeof(buf), f);
                   while (*p++ != '\0')
                     {
                        if (p[0] == ' ') { count++; p++; }
diff --git a/src/lib/edi_build_provider_cmake.c b/src/lib/edi_build_provider_cmake.c
index f308914..ae9a9d5 100644
--- a/src/lib/edi_build_provider_cmake.c
+++ b/src/lib/edi_build_provider_cmake.c
@@ -40,7 +40,8 @@ _cmake_file_hidden_is(const char *file)
 static void
 _cmake_build(void)
 {
-   chdir(edi_project_get());
+   if (chdir(edi_project_get()) != 0)
+     ERR("Could not chdir");
    ecore_exe_pipe_run("mkdir -p build && cd build && cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 .. && make && cd ..",
                               ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
                               ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
@@ -50,7 +51,8 @@ _cmake_build(void)
 static void
 _cmake_test(void)
 {
-   chdir(edi_project_get());
+   if (chdir(edi_project_get()) != 0)
+     ERR("Could not chdir");
    ecore_exe_pipe_run("env CK_VERBOSITY=verbose make check", ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
                               ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
                               ECORE_EXE_PIPE_WRITE | ECORE_EXE_USE_SH, NULL);
@@ -59,7 +61,8 @@ _cmake_test(void)
 static void
 _cmake_clean(void)
 {
-   chdir(edi_project_get());
+   if (chdir(edi_project_get()) != 0)
+     ERR("Could not chdir");
    ecore_exe_pipe_run("make clean", ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
                               ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
                               ECORE_EXE_PIPE_WRITE | ECORE_EXE_USE_SH, NULL);
diff --git a/src/lib/edi_build_provider_make.c b/src/lib/edi_build_provider_make.c
index d3ac2d5..0a61635 100644
--- a/src/lib/edi_build_provider_make.c
+++ b/src/lib/edi_build_provider_make.c
@@ -47,7 +47,8 @@ _make_file_hidden_is(const char *file)
 static void
 _make_build_make(void)
 {
-   chdir(edi_project_get());
+   if (chdir(edi_project_get()) != 0)
+     ERR("Could not chdir");
    ecore_exe_pipe_run(BEAR_COMMAND MAKE_COMMAND, ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
                               ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
                               ECORE_EXE_PIPE_WRITE | ECORE_EXE_USE_SH, NULL);
@@ -56,7 +57,8 @@ _make_build_make(void)
 static void
 _make_build_configure(void)
 {
-   chdir(edi_project_get());
+   if (chdir(edi_project_get()) != 0)
+     ERR("Could not chdir");
    ecore_exe_pipe_run("./configure && " BEAR_COMMAND MAKE_COMMAND,
                               ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
                               ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
@@ -66,7 +68,8 @@ _make_build_configure(void)
 static void
 _make_build_autogen(void)
 {
-   chdir(edi_project_get());
+   if (chdir(edi_project_get()) != 0)
+     ERR("Could not chdir");
    ecore_exe_pipe_run("./autogen.sh && " BEAR_COMMAND MAKE_COMMAND,
                               ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
                               ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
@@ -87,6 +90,8 @@ _make_build(void)
 static void
 _make_test(void)
 {
+   if (chdir(edi_project_get()) != 0)
+     ERR("Could not chdir");
    chdir(edi_project_get());
    ecore_exe_pipe_run("env CK_VERBOSITY=verbose" MAKE_COMMAND " check", ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
                               ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
@@ -96,7 +101,8 @@ _make_test(void)
 static void
 _make_clean(void)
 {
-   chdir(edi_project_get());
+   if (chdir(edi_project_get()) !=0)
+     ERR("Could not chdir");
    ecore_exe_pipe_run("make clean", ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
                               ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
                               ECORE_EXE_PIPE_WRITE | ECORE_EXE_USE_SH, NULL);
diff --git a/src/lib/edi_create.c b/src/lib/edi_create.c
index de31d48..0abfa75 100644
--- a/src/lib/edi_create.c
+++ b/src/lib/edi_create.c
@@ -162,7 +162,8 @@ _edi_create_filter_file_done(void *data, int type EINA_UNUSED, void *event EINA_
    handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _edi_create_project_done, data);
    create->handler = handler;
 
-   chdir(create->path);
+   if (chdir(create->path) != 0)
+     ERR("Could not chdir");
 
    command = eina_strbuf_new();