Unable to edit CQWP within publishing site

When I add a Content Query to any page within a publishing site collection, either via checked-out page edit (Wiki or BWP page) or via SPD, I receive an error when I attempt to edit the webpart.

The correlation error contains the following;

ConsoleUtilies.GetContextualControlMode had no currentPage so the current SPWebPartManager mode cannot be retrieved.

System.ArgumentNullException: Key cannot be null. Parameter name: key at System.Collections.Hashtable.ContainsKey(Object key) at Microsoft.SharePoint.Publishing.WebControls.ContentByQueryWebPart.addFieldIntoHashTable(Hashtable table, SPField field) at Microsoft.SharePoint.Publishing.WebControls.ContentByQueryWebPart.createAllFieldsForDataViewMapping() at Microsoft.SharePoint.Publishing.WebControls.ContentByQueryWebPart.get_AllFieldsForDataViewMapping() at Microsoft.SharePoint.Publishing.WebControls.ContentByQueryToolPart.getDisplayedDataViewMapping(SPWeb web, String input) at Microsoft.SharePoint.Publishing.WebControls.ContentByQueryToolPart.populateFieldsToDisplayControlGroup(Boolean clearInvalidMappings)

Any suggestions?