Added a check for destination type being null
Merge branch 'master' into DecimalSuffix