Merge branch 'fix-plot-select-exception' into 'master'

Flint: Properly handle exception during plotselect

Closes #3386 (closed)

See merge request !5074 (merged)

(cherry picked from commit 4563ce00)

28c4b9ad Early skip normal case instead of raising an exception