diff --git a/source/dub/dependency.d b/source/dub/dependency.d
index b17280c..8e00b23 100644
--- a/source/dub/dependency.d
+++ b/source/dub/dependency.d
@@ -576,9 +576,8 @@
 	private void forAllDependencies(void delegate (const PkgType* avail, string pkgId, Dependency d, const Package issuer) dg) const {
 		foreach(string issuerPackag, issuer; m_packages) {
 			foreach(string depPkg, dependency; issuer.dependencies) {
-				auto basePkg = depPkg.getBasePackage();
-				auto availPkg = basePkg in m_packages;
-				dg(availPkg, basePkg, dependency, issuer);
+				auto availPkg = depPkg in m_packages;
+				dg(availPkg, depPkg, dependency, issuer);
 			}
 		}
 	}
diff --git a/source/dub/project.d b/source/dub/project.d
index 1ad0b90..9c41235 100644
--- a/source/dub/project.d
+++ b/source/dub/project.d
@@ -549,7 +549,7 @@
 
 			auto toLookup = missing;
 			foreach(id, dep; graph.optional()) {
-				enforce(id !in toLookup, "A missing dependency in the graph seems to be optional, which is an error.");
+				assert(id !in toLookup, "A missing dependency in the graph seems to be optional, which is an error.");
 				toLookup[id] = dep;
 			}