SONATA-158 - Added server-side validation as well