Ok, good to merge if we throw an exception in this case?