Add additional error checking, remove a singleton.