fix: separate error emit args from regular emit args

fix: separate error emit args from regular emit args #507