Fixing come exceptions.