Merge "Correctly set error code" into studio-1.0-dev automerge: 7b26ed5
automerge: 2cd704d

* commit '2cd704d9f6686cd4aa9088b7d86aa3e507974b2b':
  Correctly set error code