Fixed bundle and debug info handling in fallthrough check