Removed old method used with custom deserializer
Small amount of tidy up and added some null checking and exception handling (there was a burried Illegal Arguements Exception in the underlying mapping code which should probably thrown and treated differently if it happens).