nullpointers on 'pick commons' and 'pick neighbors' fixed
Authored by: mlewinsk 2016-03-11
Parent: [r878]
Child: [r880]