Fixing BPS-497

Fixing Nullpointer exception in BPS-497.  If the timestamp value retrieved from the map is null, current timestamp is set