Fixing too broad excepts.