diff --git a/application/controllers/projects.php b/application/controllers/projects.php
index f5ff642..ad89ebf 100644
--- a/application/controllers/projects.php
+++ b/application/controllers/projects.php
@@ -77,26 +77,28 @@ class Projects extends MY_Controller {
 
 		$this->form_validation->set_rules($config);
 
-		$config = array();
-		$config['upload_path'] = '/tmp';
-		$config['allowed_types'] = 'zip';
-		$config['max_size']	= '1024';
-		$config['file_name'] = 'defaultmodel';
+		if (count($_POST) > 0) {
+			$config = array();
+			$config['upload_path'] = '/tmp';
+			$config['allowed_types'] = 'txt';
+			$config['max_size']	= '1024';
+			$config['file_name'] = 'defaultmodel';
 
-		$this->upload->initialize($config);
-		$modelUploaded = $this->upload->do_upload('defaultmodel');
-		$modelData = $this->upload->data();
+			$this->upload->initialize($config);
+			$modelUploaded = $this->upload->do_upload('defaultmodel');
+			$modelData = $this->upload->data();
 
-		$config['file_name'] = 'defaultconfig';
+			$config['file_name'] = 'defaultconfig';
 
-		$this->upload->initialize($config);
-		$configUploaded = $this->upload->do_upload('defaultconfig');
-		$configData = $this->upload->data();
+			$this->upload->initialize($config);
+			$configUploaded = $this->upload->do_upload('defaultconfig');
+			$configData = $this->upload->data();
+		}
 
 		// run form validation
-		if ($this->form_validation->run() == false || $modelUploaded == false || $configUploaded == false) {
-			$data['model']['success'] = $modelUploaded;
-			$data['config']['success'] = $configUploaded;
+		if ($this->form_validation->run() == false) {
+			$data['model']['success'] = isset($modelUploaded) && $modelUploaded ? true : false;
+			$data['config']['success'] = isset($configUploaded) && $configUploaded ? true: false;
 
 			$this->load->view('project/new', $data);
 		} else {
@@ -122,8 +124,12 @@ class Projects extends MY_Controller {
 					chmod($projectpath, 0777);
 				}
 
-				copy($modelData['full_path'], $projectpath . $modelData['file_name']);
-				copy($configData['full_path'], $projectpath . $configData['file_name']);
+				if ($modelUploaded) {
+					copy($modelData['full_path'], $projectpath . $modelData['file_name']);
+				}
+				if ($configUploaded) {
+					copy($configData['full_path'], $projectpath . $configData['file_name']);
+				}
 
 				$this->messages->add($projectpath, 'notice');
 				redirect('/projects/detail/' . $data['project_id'], 301);
diff --git a/application/views/project/new.php b/application/views/project/new.php
index d3b0ace..2910b3e 100644
--- a/application/views/project/new.php
+++ b/application/views/project/new.php
@@ -15,7 +15,7 @@
 				<li>
 					<h4>Projektname <span class="req">*</span></h4>
 					<div>
-						<input type="text" name="name" class="short text" tabindex="1" value="<?=set_value('name') == null ? $this->input->post('name') : set_value('name');?>">
+						<input type="text" name="name" class="short text" tabindex="1" value="<?=set_value('name') == '' ? $this->input->post('name') : set_value('name');?>">
 						<?=form_error('name')?>
 					</div>
 				</li>
@@ -23,7 +23,7 @@
 					<h4>Beschreibung</h4>
 					<label class="note">Eine Beschreibung ist hilfreich, wenn Sie dieses Projekt später für andere Mitarbeiter freigeben möchten.</label>
 					<div>
-						<textarea name="description" rows="6" cols="60" tabindex="2" class="textarea"><?=set_value('description') == null ? $this->input->post('description') : set_value('description');?></textarea>
+						<textarea name="description" rows="6" cols="60" tabindex="2" class="textarea"><?=set_value('description') == '' ? $this->input->post('description') : set_value('description');?></textarea>
 						<?=form_error('description')?>
 					</div>
 				</li>