Handle empty plans
Merge pull request #4876 from danmcp/master

Merged by openshift-bot