#209 #246 - Putting Log warning statement for null mapid back in