Fixed loss of changes in instance list, catch bad filename