Adds query error handling to geometry importer