Fix for null pointer exception during CS for savings