Add handling of exceptions that appeared in real use.
Add recognition of new extentions.
Add handling of exceptions that appeared in real use.
Synchro branch 'sidecar' with 'master'.