Equality of optionals now throws on null values.

Not yet sure of the correct error message for a null expected value.