Added handling of unclaimed replies