catch invalid plot number
Merge branch 'patch-HomeCmd3'