Fixes #127: Made global storage validator friendly.