CIRCLE / cloud

NoOrgId exception was thrown but not handled in some cases. We don't really need this exception, so just use NoStoreException instead which is already handled correctly.