Changed the baseline fetching method to return the most recent baseline where there are more than one. It was raising an exception (which is not cool).
There are times when there is legitimately more than one baseline (i.e. before a merge has consolidated it). The problem was arising during saves, which were apparently occurring before the second baseline was consolidated.