Added some error handling in StreamViewer