diff --git a/bluemix/version.go b/bluemix/version.go
index 1ff62d1..6065a7f 100644
--- a/bluemix/version.go
+++ b/bluemix/version.go
@@ -3,7 +3,7 @@ package bluemix
 import "fmt"
 
 // Version is the SDK version
-var Version = VersionType{Major: 1, Minor: 0, Build: 0}
+var Version = VersionType{Major: 1, Minor: 0, Build: 1}
 
 // VersionType describe version info
 type VersionType struct {
diff --git a/i18n/i18n.go b/i18n/i18n.go
index 66271da..b026e49 100644
--- a/i18n/i18n.go
+++ b/i18n/i18n.go
@@ -20,10 +20,9 @@ const (
 )
 
 var (
-	bundle                *i18n.Bundle
-	T                     TranslateFunc
-	RESOURCE_PATH         = filepath.Join("i18n", "resources")
-	TRANSLATION_NOT_FOUND = "!!i18N_MESSAGE_NOT_FOUND!!"
+	bundle        *i18n.Bundle
+	T             TranslateFunc
+	RESOURCE_PATH = filepath.Join("i18n", "resources")
 )
 
 func init() {
@@ -83,9 +82,9 @@ func Translate(loc *i18n.Localizer) TranslateFunc {
 
 		// If no message is returned we can assume that that
 		// the translation could not be found in any of the files
-		// Set the message as !!i18N_MESSAGE_NOT_FOUND!!
+		// Set the message as the messageID
 		if msg == "" {
-			msg = TRANSLATION_NOT_FOUND
+			msg = messageId
 		}
 		return msg
 
diff --git a/plugin_examples/list_plugin/commands/list_test.go b/plugin_examples/list_plugin/commands/list_test.go
index 6d3ca97..90bbf26 100644
--- a/plugin_examples/list_plugin/commands/list_test.go
+++ b/plugin_examples/list_plugin/commands/list_test.go
@@ -2,7 +2,6 @@ package commands_test
 
 import (
 	sdkmodels "github.com/IBM-Cloud/ibm-cloud-cli-sdk/bluemix/models"
-	"github.com/IBM-Cloud/ibm-cloud-cli-sdk/i18n"
 	"github.com/IBM-Cloud/ibm-cloud-cli-sdk/plugin/pluginfakes"
 	"github.com/IBM-Cloud/ibm-cloud-cli-sdk/plugin_examples/list_plugin/api/fakes"
 	. "github.com/IBM-Cloud/ibm-cloud-cli-sdk/plugin_examples/list_plugin/commands"
@@ -46,7 +45,7 @@ var _ = Describe("ListCommand", func() {
 			It("Should fail", func() {
 				err = cmd.Run([]string{})
 				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(Equal(i18n.TRANSLATION_NOT_FOUND))
+				Expect(err.Error()).To(Equal("No CF API endpoint set. Use '{{.Command}}' to target a CloudFoundry environment."))
 			})
 		})
 	})