This simplifies the interface since close does the right thing
without help from the application.  Also improves error checking.