Added null check in the Mapper service and prepared statement properties.