Short term fix for #47
Merge pull request #128 from lloydwatkin/exception

Short term fix for #47