Updated Issue #373: Revoved system/validation/exception