added object types and null; added filename to error fragment