Better validation of response type
 - Fixes #134