Merge "Map Errors.h's UNEXPECTED_NULL to NullPointerException"