Added utility and cleaned up errors