Added not_empty validation for issue #625.