[Extensions] Cosmetics for EP crash handling

Tiny fixes for an after-merge review.
Merge pull request #1182 from jeez/fixes

[Extensions] Cosmetics for EP crash handling