diff --git a/go/dhcp/api.go b/go/dhcp/api.go
index <HASH>..<HASH> 100644
--- a/go/dhcp/api.go
+++ b/go/dhcp/api.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"log"
 	"net"
 	"net/http"
 	"strconv"
@@ -208,11 +207,11 @@ func decodeOptions(b string) map[dhcp.OptionCode][]byte {
 	var options []Options
 	_, value := etcdGet(b)
 	decodedValue := converttobyte(value)
+	var dhcpOptions = make(map[dhcp.OptionCode][]byte)
 	if err := json.Unmarshal(decodedValue, &options); err != nil {
-		log.Fatal(err)
+		return dhcpOptions
 	}
-	// spew.Dump(options)
-	var dhcpOptions = make(map[dhcp.OptionCode][]byte)
+
 	for _, option := range options {
 		var Value interface{}
 		switch option.Type {
Do not crash when there is nothing in the cache