Added support for mapping dbNulls correctly