Merge "change if bad to assert not bad, message"