[8897] More stricted checks for store operations.