Start of error handling implementation
Fix test for stream requests