...while attempting to build the ColumnMap.

This makes sure that buildSQLQuery() works even if no actual query is present.