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

* commit '7b26ed51415fc2e4536c6841a37c3b5ff2f143ac':
  Correctly set error code