error handling improvements
ddwq
Merge remote-tracking branch 'origin/master'