More NokiaStore fixes
Catch more random crashes