Catchign null responses

Fixes #1