Currently there are a couple of places the return errors are not checked, which needs to be changed.
Currently there are a couple of places the return errors are not checked, which needs to be changed.