Attempting to do a better return status