diff --git a/src/Header.svelte b/src/Header.svelte
index 1f501b8b8..c17a61eee 100644
--- a/src/Header.svelte
+++ b/src/Header.svelte
@@ -105,7 +105,7 @@
Register
Vesting
- {#if config && config.signer && config.network.name === 'ropsten'}
+ {#if session && config && config.signer && config.network.name === 'ropsten'}
Orgs
{/if}
diff --git a/src/base/orgs/Create.svelte b/src/base/orgs/Create.svelte
index 7e534ab39..a2c0aff6c 100644
--- a/src/base/orgs/Create.svelte
+++ b/src/base/orgs/Create.svelte
@@ -1,5 +1,6 @@
- navigate('/')} />
+{#if owner}
+ navigate('/')} />
+{:else}
+ window.history.back()}>
+ Not connected.
+
+{/if}
diff --git a/src/base/orgs/View.svelte b/src/base/orgs/View.svelte
index 452fbcad4..da60b927a 100644
--- a/src/base/orgs/View.svelte
+++ b/src/base/orgs/View.svelte
@@ -26,7 +26,7 @@
onMount(async () => {
name = await config.provider.lookupAddress(address);
- registration = await getRegistration(name, config);
+ if (name) registration = await getRegistration(name, config);
});
let setNameForm: typeof SvelteComponent | null = null;