Extensions: Rescue from throwing exception.(#863)
Merge pull request #865 from am11/extension

Extensions: Rescue from throwing exception.(#863)