Change logic in soap step generator catch block, add FQDN class