diff --git a/node_embed.module b/node_embed.module
index 2155be8..719340f 100644
--- a/node_embed.module
+++ b/node_embed.module
@@ -43,7 +43,7 @@ function node_embed_filter_tips($delta, $format, $long = FALSE) {
  * Implementation of hook_preprocess_node()
  */
 function node_embed_preprocess_node(&$vars) {
-  if ($vars['node_embedded']) { 
+  if (!empty($vars['node_embedded'])) { 
     $vars['template_files'][] = "node-embed--default";
     $vars['template_files'][] = 'node-embed--' . $vars['type'];
   }
@@ -144,8 +144,8 @@ function node_embed_form_alter(&$form, $form_state, $form_id) {
  * results in segment fault.
  */
 function node_embed_validate($form, &$form_state) {
+  if (!empty($form['nid']['#value'])) {
   $nid = $form['nid']['#value'];  
-  if ($nid) {
     $needle = "[[nid:$nid]]";
     $found = strpos($form['#post']['body'], $needle);
     if ($found === FALSE) {