Add MessageBus.diagnostics() to help trouble shoot issues
Add exception handling for all external calls
Minor cleanup