added return to each errors
Revert "added return to each errors"

This reverts commit 88c0dd81b6aae77f6afae53643e06cd4d7b5ac9f.
Revert "added return to each errors"

This reverts commit 88c0dd81b6aae77f6afae53643e06cd4d7b5ac9f.