for issue fte-419
add variable check in order to remove the log notice message
Merge branch 'master' of https://github.com/qiang2liu/drupal_dev_demo