Merge pull request #979 from pingunaut/master

Remove empty catch blocks to stop swallowing exceptions. #498