Ckozak/fix validate null prod