diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/JavaPrototypeGenerateAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/JavaPrototypeGenerateAction.java
index 28070d2..90bbd0e 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/actions/JavaPrototypeGenerateAction.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/actions/JavaPrototypeGenerateAction.java
@@ -36,6 +36,10 @@
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		DataFlowGraph graph = editor.getDataFlowGraph();
+		if (graph == null) {
+			editor.changeStage(Editor.STAGE_PUSH_PULL_SELECTION);			
+			graph = editor.getDataFlowGraph();
+		}
 		if (graph != null) {
 			DataTransferModel model = editor.getModel();
 			ModelExtension.extendModel(model);