ENYO-2063: fix review comments (err not checked)