diff --git a/ChangeLog.md b/ChangeLog.md
index a732ed2..71ad0b5 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,6 @@
+## 0.0.17
+- Fixed null collection issue / NPE (Issue 8)
+
 ## 0.0.16
 - Unloader will quote collections (which the loader expects)
 - Fixed collection issue (Issue 14)
diff --git a/README.md b/README.md
index e4bb8f3..915670c 100644
--- a/README.md
+++ b/README.md
@@ -15,11 +15,11 @@ loading of various types of delimited files, including
 
 ### Downloading
 This utility has already been built, and is available at
-https://github.com/brianmhess/cassandra-loader/releases/download/v0.0.16/cassandra-loader
+https://github.com/brianmhess/cassandra-loader/releases/download/v0.0.17/cassandra-loader
 
 Get it with wget:
 ```
-wget https://github.com/brianmhess/cassandra-loader/releases/download/v0.0.16/cassandra-loader
+wget https://github.com/brianmhess/cassandra-loader/releases/download/v0.0.17/cassandra-loader
 ```
 
 ### Building
@@ -255,7 +255,7 @@ cassandra-unloader
 
 Usage statement:
 ```
-version: 0.0.16
+version: 0.0.17
 Usage: -f <outputStem> -host <ipaddress> -schema <schema> [OPTIONS]
 OPTIONS:
   -configFile <filename>         File with configuration options
diff --git a/build.gradle b/build.gradle
index e7c9d91..a530620 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java'
 apply plugin: 'application'
 
-def versionNum = '0.0.16'
+def versionNum = '0.0.17'
 
 allprojects {
     tasks.withType(JavaCompile) {
diff --git a/src/main/java/com/datastax/loader/CqlDelimLoad.java b/src/main/java/com/datastax/loader/CqlDelimLoad.java
index bcbfa0f..62e106d 100644
--- a/src/main/java/com/datastax/loader/CqlDelimLoad.java
+++ b/src/main/java/com/datastax/loader/CqlDelimLoad.java
@@ -86,7 +86,7 @@
 import com.codahale.metrics.Timer;
 
 public class CqlDelimLoad {
-    private String version = "0.0.16";
+    private String version = "0.0.17";
     private String host = null;
     private int port = 9042;
     private String username = null;
diff --git a/src/main/java/com/datastax/loader/CqlDelimUnload.java b/src/main/java/com/datastax/loader/CqlDelimUnload.java
index adde9b0..897c937 100644
--- a/src/main/java/com/datastax/loader/CqlDelimUnload.java
+++ b/src/main/java/com/datastax/loader/CqlDelimUnload.java
@@ -75,7 +75,7 @@
 
 
 public class CqlDelimUnload {
-    private String version = "0.0.16";
+    private String version = "0.0.17";
     private String host = null;
     private int port = 9042;
     private String username = null;