- correctly check for nil value (bnc#803787)

- 2.17.54