Fixed exceptions and dependencies