Bubbling up errors from search()
Merge branch 'hotfix/v0.0.9'