Fix NoSuchKegFromTapError
handling
#18334
+16
−23
Merged