Fixes several description related issues with fancy storage
Merge pull request #6160 from xxalpha/somethingsomethingreturnnull

Fixes a couple description related issues with fancy storage