Fixed xml nil handling