Fixed handling of non existent files