Added custom exception wrapper for communication exceptions. Minor renaming and cleanup.