Added graceful unsubscribe.