Fix issue #92: Perform validation in retrieve rather than validate