ADEN-1178 remove unreachable code
ADEN-1178 add logging in place where it is reachable
ADEN-1178 cr fixes
Merge pull request #3776 from Wikia/aden-1178-noremnant-new

Aden 1178 noremnant new