Check NPE in setVoiceCommands()bugfix/issue_1293

1 files changed, 4 insertions, 1 deletions

diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java
index ebffcc634..731504735 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java
@@ -126,7 +126,10 @@ abstract class BaseVoiceCommandManager extends BaseSubManager {
 		waitingOnHMIUpdate = false;
 		lastVoiceCommandId = voiceCommandIdMin;
 		updateIdsOnVoiceCommands(voiceCommands);
-		this.oldVoiceCommands = new ArrayList<>(this.voiceCommands);
+		this.oldVoiceCommands = new ArrayList<>();
+		if (this.voiceCommands != null && !this.voiceCommands.isEmpty()) {
+			this.oldVoiceCommands.addAll(this.voiceCommands);
+		}
 		this.voiceCommands = new ArrayList<>(voiceCommands);
 
 		update();