Fix for WP-954, the link field is no longer required and needs to be handled if null