Initial event tagging implementation
Fix error handling