Add error checking for number mappings
0.6.18