handle missing client type

Sync with master