Merge "return 404 instead of 500 if subscription does not exist"