ADEN-1178 remove unreachable code
ADEN-1178 add logging in place where it is reachable