Internal error handler added. Rebuild