tracked down a few more document types and added them to conditions; added a marker for objects that might be null --spaden