Merge remote-tracking branch 'origin/release' into dev

cmd/params.go

@@ -48,8 +48,8 @@ func InitParams(vip *viper.Viper) params.General {
 	// Only require proto user path if session does not exist
 	var protoUserJson []byte
 	protoUserPath := ""
-	if sessionPath == "" {
-		jww.INFO.Printf("Session file-path was not specified, attempting to load proto client file...")
+	if sessionPath == "" || !utils.Exists(sessionPath) {
+		jww.INFO.Printf("Session file-path was not specified or does not exist, attempting to load proto client file...")
 		protoUserPath, err = utils.ExpandPath(viper.GetString("protoUserPath"))
 		if err != nil {
 			jww.FATAL.Fatalf("Failed to read proto path: %+v", err)

cmd/root.go

@@ -104,7 +104,7 @@ var rootCmd = &cobra.Command{
 
 		// Pass NDF directly into client library
 		var client *api.Client
-		if p.SessionPath != "" {
+		if p.SessionPath != "" && utils.Exists(p.SessionPath) {
 			client, err = api.LoginWithNewBaseNDF_UNSAFE(p.SessionPath,
 				[]byte(sessionPass), string(returnedNdf.GetNdf()),
 				params.GetDefaultNetwork())