fix: [backport] add better error messages for a couple of error cases

fix: [backport] add better error messages for a couple of error cases #353