Switch to handling general exceptions