Better checking of adapter arguments