diff --git a/src/components/ContentWrap.jsx b/src/components/ContentWrap.jsx
index 2ee20b9..4e8c6e0 100644
--- a/src/components/ContentWrap.jsx
+++ b/src/components/ContentWrap.jsx
@@ -179,10 +179,10 @@ export default class ContentWrap extends Component {
 				};
 				const writeInsideIframe = () => {
 					const sandbox = this.frame.getAttribute('sweet');
-					console.log('setting back sandbox attr', sandbox);
+					// console.log('setting back sandbox attr', sandbox);
 					this.frame.setAttribute('sandbox', sandbox);
 					this.frame.removeAttribute('sweet');
-					console.log('sending postmessage');
+					// console.log('sending postmessage');
 					this.frame.contentWindow.postMessage({ contents }, '*');
 					// this.frame.contentDocument.open();
 					// this.frame.contentDocument.write(contents);
@@ -190,7 +190,7 @@ export default class ContentWrap extends Component {
 				};
 				refreshAndDo(() => {
 					const sandbox = this.frame.getAttribute('sandbox');
-					console.log('removing sandbox', sandbox);
+					// console.log('removing sandbox', sandbox);
 					this.frame.setAttribute('sweet', sandbox);
 					this.frame.removeAttribute('sandbox');
 					refreshAndDo(writeInsideIframe);
diff --git a/src/components/app.jsx b/src/components/app.jsx
index 1a304c7..3ffb205 100644
--- a/src/components/app.jsx
+++ b/src/components/app.jsx
@@ -2,6 +2,7 @@
  */
 
 import { h, Component } from 'preact';
+import { route } from 'preact-router';
 // import '../service-worker-registration';
 import { MainHeader } from './MainHeader.jsx';
 import ContentWrap from './ContentWrap.jsx';
@@ -253,9 +254,17 @@ export default class App extends Component {
 					this.refreshEditor();
 				});
 			} else if (this.props.itemId) {
-				window.db.fetchItem(this.props.itemId).then(item => {
-					this.setCurrentItem(item).then(() => this.refreshEditor());
-				});
+				window.db
+					.fetchItem(this.props.itemId)
+					.then(item => {
+						this.setCurrentItem(item).then(() => this.refreshEditor());
+					})
+					.catch(err => {
+						alert('No such creation found!');
+						this.createNewItem();
+
+						// route('/');
+					});
 			} else if (result.preserveLastCode && lastCode) {
 				this.setState({ unsavedEditCount: 0 });
 				log('Load last unsaved item', lastCode);
@@ -430,10 +439,12 @@ export default class App extends Component {
 			};
 		}
 		this.setCurrentItem(item).then(() => this.refreshEditor());
+		route('/create');
 		alertsService.add('New item created');
 	}
 	openItem(item) {
 		this.setCurrentItem(item).then(() => this.refreshEditor());
+		route(`/create/${item.id}`);
 		alertsService.add('Saved item loaded');
 	}
 	removeItem(item) {