Yea, there was catch for this issue before, but it should not happen.  The getOrElse and referencePair removed.