Fix for 2028 - check for current subscription before accessing it
Merge pull request #2032 from christav/storage-fix-2028

Fix for 2028 - check for current subscription before accessing it