Added a commit that cleans up all the error returns in this file.