Removed check for empty object