Implemented error handling, bundles