added trap support for :invalid-argument
CORE-6134 added info-type and entity-type support