Possible fix for handyman generating crashes.
Issue 1460.

Thanks, Alan!

git-svn-id: http://corsix-th.googlecode.com/svn/trunk@2268 c39591fa-788f-11de-a72b-d90af8dea425