Merge "Better error reporting." into studio-1.3-dev