Merge "Add else branch to avoide fclose(NULL)" am: 10b043bb13
am: dded161774

Change-Id: Ifda3e38fe8129b8ea680c99689f9b0a49fdba831