better handling of an Exception, which would have led to a NullPointerException anyway a few lines layer.
Authored by: mrieser 2010-04-30
Parent: [r11356]
Child: [r11358]
