Merge "Check and return correct error code" into studio-1.0-dev automerge: a919f37
automerge: f973421

* commit 'f97342105f6902a022aa6604a24c464e452f7cb4':
  Check and return correct error code