Minor foxes for activity polyfill
Improve some error handlers