* Avoid runtime exception when file doesn't exist * Update the check based on feedback * Revert the old fix
