Catch more exceptions - resolves #2. Thanks Laurier!