Optimize table creation
Add error handler to async step