Issue #35. Small correction.
Issue #35. Made sure unexpected elements don't get processed when
marshalling.