Prevent NPE from overriden Resource implementations

Some resource implementations fail to consider "null" input as the
options map for "doSave" and end up in NullPointerExceptions.

Change-Id: Ie38dff790ac4ed7b1763fc5a8290f610216add8e
2 files changed