Add more basic necessary stuff.
Remove error handler.