Fixed exception throwing bug, tweaked tolerances