diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 786daa2..3bd5697 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -104,7 +104,9 @@ class CoursesController < ApplicationController
 
 	protected
 	def find_course
-		params[:id] = Course.find(:first, :conditions => ['short_name = ?', params[:id]], :order => 'period desc').id if !params[:id].is_numeric? and !Course.find_by_short_name(params[:id]).nil?
+		if params[:id]
+			params[:id] = Course.find(:first, :conditions => ['short_name = ?', params[:id]], :order => 'period desc').id if !params[:id].is_numeric? and !Course.find_by_short_name(params[:id]).nil?
+		end
 		@course = params[:id] ? Course.find(params[:id]) : Course.new(params[:course])
 	end
 
diff --git a/test/fixtures/courses.yml b/test/fixtures/courses.yml
index c99ff8d..3d46a47 100644
--- a/test/fixtures/courses.yml
+++ b/test/fixtures/courses.yml
@@ -19,4 +19,5 @@ course_1:
   short_name: course1
   full_name: Firt Course
   description: Description goes here
+  period: <%= App.current_period %>