Foolproofing Checking for Objects

A better fix on checking for objects only.