Re-adds error handling to eli