Check if we have a string before calling replace().
Merge pull request #19 from kostajh/develop

Check if we have a string before calling replace().