Now throws UnexpectedValueException rather than MWException. Change-Id: Id466b66f43db97c5837030d166b9abd66fd56e0d