Please pull some error handling fixes