Explicit exception
Merge pull request #1005 from winzou/resource-ex

Explicit exception