diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index eb5f7e0c42..8c0543dc11 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -4886,11 +4886,6 @@ _create_indicator(Evas_Object *obj)
    const char *indicator_serv_name;
 
    indicator_serv_name = "elm_indicator_portrait";
-   if (!indicator_serv_name)
-     {
-        ERR("Conformant cannot get portrait indicator service name");
-        return NULL;
-     }
 
    indicator = elm_plug_add(obj);
    if (!indicator)
diff --git a/src/lib/elementary/elm_code_file.c b/src/lib/elementary/elm_code_file.c
index f0b7861aad..d82a7716bd 100644
--- a/src/lib/elementary/elm_code_file.c
+++ b/src/lib/elementary/elm_code_file.c
@@ -121,6 +121,8 @@ EAPI Elm_Code_File *elm_code_file_new(Elm_Code *code)
 
 EAPI Elm_Code_File *elm_code_file_open(Elm_Code *code, const char *path)
 {
+   EINA_SAFETY_ON_NULL_RETURN_VAL(code, NULL);
+
    Elm_Code_File *ret;
    Eina_File *file;
    Eina_File_Line *line;
@@ -214,7 +216,13 @@ EAPI void elm_code_file_save(Elm_Code_File *file)
    free(tmp);
 
    if (have_mode)
-     chmod(path, mode);
+     {
+        if(chmod(path, mode) < 0)
+          {
+             ERR("Error in chmod(%s, %s) - %d(%s)\n", path, mode, errno, strerror(errno));
+             return;
+          }
+     }
 
    if (file->parent)
      {