diff --git a/build.sbt b/build.sbt
index 4c2304c..1d8b3fe 100644
--- a/build.sbt
+++ b/build.sbt
@@ -18,12 +18,19 @@ crossPaths := false
 
 credentials += Credentials(
   sys.props.getOrElse("repo.name", "Sponge Repo"),
-  new URL(sys.props("repo.url")).getHost,
-  sys.props("repo.user"),
-  sys.props("repo.pwd")
+  sys.props.get("repo.url").map(new URL(_).getHost).getOrElse(""),
+  sys.props.getOrElse("repo.user", ""),
+  sys.props.getOrElse("repo.pwd", "")
 )
 
-publishTo := Some(sys.props.getOrElse("repo.name", "Sponge Repo") at sys.props("repo.url"))
+publishTo <<= version { (v: String) =>
+  val repoName = sys.props.get("repo.name")
+  val repoUrl = sys.props.get("repo.url")
+  if (repoName.isDefined && repoUrl.isDefined)
+    Some(repoName.get at repoUrl.get)
+  else
+    Some(Resolver.file("file", new File(Path.userHome.absolutePath + "/.ivy2/local")))
+}
 
 // Replace default publish task with the one from sbt-aether-deploy
 overridePublishSettings