better error handling in subscription change endpoint; severe reindentation