fix probem with subscription not cancelling due to long polling
fix issue with errors not returning