Fix #24 - Display nice error message if token is supplied without client credentials
Fixes some problems with new protocol detection