Error handling now support nil response (for offline situations)
Merge
renamed tests to match streams methods rename