Added exception and fixed dependencies.