diff --git a/v2/example/sonyflake_server.go b/v2/example/sonyflake_server.go
index ca99ed6..aee4beb 100644
--- a/v2/example/sonyflake_server.go
+++ b/v2/example/sonyflake_server.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"encoding/json"
-	"log"
 	"net/http"
 
 	"github.com/sony/sonyflake/v2"
@@ -14,13 +13,11 @@ var sf *sonyflake.Sonyflake
 func init() {
 	var st sonyflake.Settings
 	st.MachineID = awsutil.AmazonEC2MachineID
+
 	var err error
-sf, err = sonyflake.New(st)
-if err != nil {
-	log.Fatal(err)
-}
-	if sf == nil {
-		panic("sonyflake not created")
+	sf, err = sonyflake.New(st)
+	if err != nil {
+		panic(err)
 	}
 }
 
diff --git a/v2/sonyflake_test.go b/v2/sonyflake_test.go
index fcb61f6..cad42e0 100644
--- a/v2/sonyflake_test.go
+++ b/v2/sonyflake_test.go
@@ -21,7 +21,8 @@ func init() {
 	var st Settings
 	st.StartTime = time.Now()
 
-	sf, err := New(st)
+	var err error
+	sf, err = New(st)
 	if err != nil {
 		panic(err)
 	}