Improve logging
Fix interruption of subscription processing