Enhanced exception processing for the Persistence Service component

Can we get this change and Paul's UI stuff in so that we can test both, please?