Merge "Correctly set error code" into studio-1.0-dev