updates to error reporting logic;
Merge branch 'develop'