diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index f92d575f..22271f7d 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -36,6 +36,13 @@ import {layoutPaths} from './theme/theme.constants';
     component: Pages,
     useAsDefault: true
   },
+  // handle any non-registered route
+  // and simply redirects back to dashboard page
+  // you can specify any customer 404 page while it's not built in ito ng2-admin
+  {
+    path: '/**',
+    redirectTo: ['Pages']
+  }
 ])
 export class App {
 
diff --git a/src/app/pages/dashboard/todo/todo.component.ts b/src/app/pages/dashboard/todo/todo.component.ts
index b10ab191..8d9b2bb4 100644
--- a/src/app/pages/dashboard/todo/todo.component.ts
+++ b/src/app/pages/dashboard/todo/todo.component.ts
@@ -33,7 +33,7 @@ export class Todo {
 
   addToDoItem($event) {
 
-    if ($event.which === 1 || $event.which === 13) {
+    if (($event.which === 1 || $event.which === 13) && this.newTodoText.trim() != '') {
 
       this.todoList.unshift({
         text: this.newTodoText,