Improved checks for Store.