Clean up and care for more types of exceptiopns.
More tests.
More testing of fp retrieval.