Error handling improvements: update project file.
Merge remote-tracking branch 'origin/master' into stable.