Fixed escaping null id
Merge pull request #423 from 1602/fix/escape-null-id

Fixed escaping null id