Fixing possi ble NRE
Merge branch 'master' of github.com:ayende/temp.raven.storage