[0.10.0-beta2] panic when collectd enabled

[bootswithdefer]

I deleted the database after the upgrade and used the new config format. Only change to config was to enable collectd. When collectd is disabled it starts up normally. Full log attached.

OS: RHEL7

panic: runtime error: invalid memory address or nil pointer dereference
[signal 0xb code=0x1 addr=0x0 pc=0x5c1a2c]

goroutine 85 [running]:
github.com/influxdb/influxdb/services/collectd.(*Service).UnmarshalCollectd(0xc2080625a0, 0xc2096cfb00, 0x0, 0x0, 0x0)
        /tmp/tmp.zI7RBxEcb8/src/github.com/influxdb/influxdb/services/collectd/service.go:302 +0x9cc
github.com/influxdb/influxdb/services/collectd.(*Service).handleMessage(0xc2080625a0, 0xc209318000, 0x51b, 0x5ac)
        /tmp/tmp.zI7RBxEcb8/src/github.com/influxdb/influxdb/services/collectd/service.go:231 +0x28a
github.com/influxdb/influxdb/services/collectd.(*Service).serve(0xc2080625a0)
        /tmp/tmp.zI7RBxEcb8/src/github.com/influxdb/influxdb/services/collectd/service.go:218 +0x2e0
created by github.com/influxdb/influxdb/services/collectd.(*Service).Open
        /tmp/tmp.zI7RBxEcb8/src/github.com/influxdb/influxdb/services/collectd/service.go:141 +0x103d

[collectd]
  enabled = true
  # bind-address = ""
  database = "collectd"
  typesdb = "/usr/share/collectd/types.db"

  # These next lines control how batching works. You should have this enabled
  # otherwise you could get dropped metrics or poor performance. Batching
  # will buffer points in memory if you have many coming in.

  batch-size = 1000 # will flush if this many points get buffered
  batch-pending = 5 # number of batches that may be pending in memory
  batch-timeout = "1s" # will flush at least this often even if we haven't hit buffer limit
  read-buffer = 0 # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max.

influxdb.txt