Fixed a few potential NPE in the Canonical to DAX mapping