WP-3433: Check if the value is not empty to fix some issues.