Not handling exceptions here.  I'm okay with this being a separate issue and handled in a separate PR.