Fix bug with nil choices.
Merge branch 'master' of github.com:zeeraw/pony