Added PersistenceServiceException handler logic

ok to test