Small fix to prevent Null exception