DDF-654: Improved exception handling in the ActivityListener