From 5cbf4c3ee581f36199986fa8a04bd0af4dfb1798 Mon Sep 17 00:00:00 2001
From: Dave Parker <dave.x.parker@gmail.com>
Date: Tue, 8 Dec 2020 09:19:00 +0000
Subject: [PATCH] Bug fix in ChoiceActionsSimple.getAction (when one state has
 no actions).

---
 prism/src/explicit/ChoiceActionsSimple.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/prism/src/explicit/ChoiceActionsSimple.java b/prism/src/explicit/ChoiceActionsSimple.java
index 2184799a..0df91356 100644
--- a/prism/src/explicit/ChoiceActionsSimple.java
+++ b/prism/src/explicit/ChoiceActionsSimple.java
@@ -144,12 +144,17 @@ public class ChoiceActionsSimple
 	
 	public Object getAction(int s, int i)
 	{
-		// Empty list means no (null) actions everywhere
+		// Null list means no (null) actions everywhere
 		if (actions == null) {
 			return null;
 		}
 		try {
-			return actions.get(s).get(i);
+			ArrayList<Object> list = actions.get(s);
+			// Null list means no (null) actions in this state
+			if (list == null) {
+				return null;
+			}
+			return list.get(i);
 		}
 		// Lists may be under-sized, indicating no action added 
 		catch (IndexOutOfBoundsException e) {