Fix Bug 9: NULL not handled