Change handling of missing xml