Add support to prevent exceptions when word is not found
Merge branch '404'

* 404:
  Add support to prevent exceptions when word is not found