Handle old style extensions properly in the error handler.
Merge origin/master