added some defensive checks  for the mapper (nypl)
Merge branch 'nypl' into virginia