Again added null checks because zorro does provide null pointers!