Error Handling Updates

Close Bugs:
Bug #689
Bug #690
Bug #691
Bug #692
Bug #693
Bug #694
Bug #696