Moves creation of streams to index.js
Updates error-handling for report type