Make queries tolerant to missing xml properties
Add very basic error logging