Added nonexist file handling