fix "Trying to get property of non-object"