Merge pull request #2603 from kumpera/fix_set_pending_exception