Re-added validation which was lost in merge.