OSMORC-54: Fixed some smelly code that produced a NullPointerException in some circumstances.
Authored by: rbeeger 2008-11-02
Parent: [r129]
Child: [r131]