Added embedded checks when building the ridMap
Merge pull request #1314 from adaher/master_RIDMAP_EMBCHECKS

Added embedded checks when building the ridMap