diff --git a/node_page/node_page.module b/node_page/node_page.module
--- a/node_page/node_page.module
+++ b/node_page/node_page.module
@@ -86,7 +86,7 @@ function node_page_node_type($op, $info) {
  */
 function node_page_form_alter(&$form, $form_state, $form_id) {
 
-  if ($form['#node']->type .'_node_form' == $form_id) {
+  if (!empty($form['#node']) && $form['#node']->type .'_node_form' == $form_id) {
     $form['template'] = array(
       '#type' => 'fieldset',
       '#title' => t('Template settings'),
@@ -186,7 +186,7 @@ function _page_templates() {
  */
 function node_page_preprocess_page(&$variables) {
 
-  if (drupal_substr(request_uri(), -5) != '/edit') {
+  if (!empty($variables['node']) && (drupal_substr(request_uri(), -5) != '/edit')) {
     if ($variables['node']->template != 'default') {
       $variables['template_files'][] = $variables['node']->template;
     }