Added check for non existing files