NEXUS-5987: Prev change introduced NPE

Related to validation. Now continued to clean up
validation, simplified it even more.