
        Cleanup and error checking

3fe91ef