Fix NPE if no persistence services enabled [ESH]

If no persistence service is selected, there is a NPE thrown. This is now detected and will present a more appropriate response.