Bug #3 - NULL handles now properly handled in admin UI.
Merge branch 'bug_3' into master-dev