Handle errors on instantiating extensions by key
Merge remote-tracking branch 'origin/master'