From f23e9497d0628e8a934affbe59a21c4f871188f7 Mon Sep 17 00:00:00 2001
From: Johannes Gocke <johannes_gocke@hotmail.de>
Date: Tue, 22 Jun 2021 08:48:48 +0200
Subject: [PATCH] Fixed null pointer exception on item select when using custom
 Source/TargetSelection.

---
 src/components/picklist/PickList.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/picklist/PickList.js b/src/components/picklist/PickList.js
index 414abf3797..ff6cd57ce2 100644
--- a/src/components/picklist/PickList.js
+++ b/src/components/picklist/PickList.js
@@ -196,10 +196,10 @@ export class PickList extends Component {
             this.setState({ [stateKey]: e.value });
         }
 
-        if (this.state.sourceSelection.length && stateKey === 'targetSelection') {
+        if (this.state.sourceSelection && this.state.sourceSelection.length && stateKey === 'targetSelection') {
             this.setState({ sourceSelection: [] })
         }
-        else if (this.state.targetSelection.length && stateKey === 'sourceSelection') {
+        else if (this.state.targetSelection && this.state.targetSelection.length && stateKey === 'sourceSelection') {
             this.setState({ targetSelection: [] })
         }
     }