Yes we'll have to perform a review on error handling in general, and on module/stream states.