Added errors system back in place