revert "handle exceptions in adhoc"