Making object_helper more robust