Check if the selection array exists before dereferencing it.

Change-Id: I63a6952a0d4493d57096d6b544f03ed9a6f0b107
Merge topic 'control-points-selection' into master

81a76c77 Check if the selection array exists before dereferencing it.