diff --git a/tools/reparsedockerfile.py b/tools/reparsedockerfile.py
index 19dce6cd4..09ac3955f 100644
--- a/tools/reparsedockerfile.py
+++ b/tools/reparsedockerfile.py
@@ -15,4 +15,9 @@ for index, command in reversed(list(enumerate(parsed_dockerfile.commands))):
     parsed_dockerfile.commands.insert(new_command_index, env_command)
     break
 
+image_and_tag_tuple = parsed_dockerfile.get_image_and_tag()
+print image_and_tag_tuple
+if image_and_tag_tuple is None or image_and_tag_tuple[0] is None:
+  raise Exception('Missing FROM command in Dockerfile')
+
 print serialize_dockerfile(parsed_dockerfile)