fixing "Trying to get property of non-object" error