diff --git a/controller/nucleus/pndFilesystemStore.go b/controller/nucleus/pndFilesystemStore.go
index 863fe72052c5adfb872f7c441b8671ad34d00e1b..c7d2df700d02ffe8bec8fef8949af74ea973bd3c 100644
--- a/controller/nucleus/pndFilesystemStore.go
+++ b/controller/nucleus/pndFilesystemStore.go
@@ -59,14 +59,15 @@ func (t *FilesystemPndStore) readAllPndsFromFile() ([]networkdomain.LoadedPnd, e
 	// }
 
 	for i, loadedPND := range loadedPnds {
+		pndUUID, err := uuid.Parse(loadedPND.ID)
+		if err != nil {
+			return nil, err
+		}
 		newPnd := NewPND(
-			uuid.MustParse(loadedPND.ID),
+			pndUUID,
 			loadedPND.Name,
 			loadedPND.Description,
 		)
-		if err != nil {
-			return nil, err
-		}
 
 		pnds[i] = newPnd
 	}