Glad that you managed to overcome this situation. I had a similar experience at Kigali airport en route to Johanessburg. But it was a small issue only and the stakes were less as i was travelling alone and the issue resolved in less than 15 mins or so.