diff -r 2e0669e814ff -r 9d0be0b1580f src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java
--- a/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java	Thu Oct 08 20:16:47 2020 +0200
+++ b/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java	Thu Oct 08 20:38:43 2020 +0200
@@ -223,12 +223,19 @@
     }
 
     @RequestMapping(requestPath = "versions/edit", method = HttpMethod.GET)
-    public ResponseType editVersion(HttpServletRequest req, DataAccessObjects dao) throws SQLException {
+    public ResponseType editVersion(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException, SQLException {
         final var viewModel = new VersionEditView();
         populate(viewModel, req, dao);
 
+        if (viewModel.getProjectInfo() == null) {
+            resp.sendError(HttpServletResponse.SC_NOT_FOUND, "No project selected.");
+            return ResponseType.NONE;
+        }
+
         if (viewModel.getVersionFilter() == null) {
-            viewModel.setVersion(new Version(-1));
+            final var version = new Version(-1);
+            version.setProject(viewModel.getProjectInfo().getProject());
+            viewModel.setVersion(version);
         } else {
             viewModel.setVersion(viewModel.getVersionFilter());
         }