assuming ES goes down, we might not receive any data. Adding cases for that
Merge branch 'master' of https://github.com/smrutiparida/lmnop