Added an extra check to the Unmarshaller.