Consolidation on excepts, improved error catching.