Add handling of configured streams that have been removed.  Tweaked error handling.