Removed unecessary error return
Merge branch 'development'

* development:
  Removed unecessary error return