LPS-32143 Fix source formating - we had used Validator.isNull because we need to check that is not null and that it is not 0 but we can leave it this way if you think it is more obvious.