Fix bug where we're throwing an exception in non-exceptional circumstances.