Fix for subscription fail handling