Commit UnexpectedValueException, should have been part of last commit