diff --git a/app/controllers/lvas_controller.rb b/app/controllers/lvas_controller.rb
index 81e60bd..974b089 100755
--- a/app/controllers/lvas_controller.rb
+++ b/app/controllers/lvas_controller.rb
@@ -9,7 +9,7 @@ class LvasController < ApplicationController
   # GET /lvas/1
 
   def show
-    @lva = Lva.find(params[:id])
+    @lva = Lva.find_by_id(params[:id])
     @toolbar_elements<<{:icon=>:pencil,:text =>I18n.t('common.edit'),:path => edit_lva_path(@lva)}
   end
 
diff --git a/app/controllers/moduls_controller.rb b/app/controllers/moduls_controller.rb
index 8eb773a..bace79f 100755
--- a/app/controllers/moduls_controller.rb
+++ b/app/controllers/moduls_controller.rb
@@ -3,14 +3,15 @@ class ModulsController < ApplicationController
   # GET /moduls.json
   def index
    @moduls = Modul.all
-   if !params[:studium_id].nil?
-   @studium=Studium.find(params[:studium_id])
-   end
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @moduls }
+   if @moduls
+    if !params[:studium_id].nil?
+     @studium=Studium.find_by_id(params[:studium_id])
+     end
+      respond_to do |format|
+        format.html # index.html.erb
+        format.json { render json: @moduls }
+      end
     end
-
   end
 
   # GET /moduls/1
diff --git a/app/models/lva.rb b/app/models/lva.rb
index e2bec09..bc4ce8f 100755
--- a/app/models/lva.rb
+++ b/app/models/lva.rb
@@ -40,19 +40,19 @@ private
 ##
 # Lade Daten aus TISS und füge diese in die Datenbank ein. 
 def load_tissdata
-	url= "https://tiss.tuwien.ac.at/api/course/"+ self.lvanr.to_s+"-2012W"
-   	begin 
-   		@hash=Hash.from_xml(open(url).read)["tuvienna"]
-  		@person=[] 
-  		if @hash["course"]["lecturers"]["oid"].is_a? String
-  			@person = @hash["course"]["lecturers"]["oid"]
-  		else
-  			@hash["course"]["lecturers"]["oid"].each do |pid|
-    				@person << Hash.from_xml(open("https://tiss.tuwien.ac.at/adressbuch/adressbuch/person_via_oid/" + pid.to_s + ".xml").read)["tuvienna"]["person"]
-  			end
-  		end
- 	rescue OpenURI::HTTPError => e
-   	end 
+  url= "https://tiss.tuwien.ac.at/api/course/"+ self.lvanr.to_s+"-2012W"
+  begin 
+    @hash=Hash.from_xml(open(url).read)["tuvienna"]
+    @person=[] 
+    if @hash["course"]["lecturers"]["oid"].is_a? String
+      @person = @hash["course"]["lecturers"]["oid"]
+    else
+      @hash["course"]["lecturers"]["oid"].each do |pid|
+        @person << Hash.from_xml(open("https://tiss.tuwien.ac.at/adressbuch/adressbuch/person_via_oid/" + pid.to_s + ".xml").read)["tuvienna"]["person"]
+      end
+    end
+  rescue OpenURI::HTTPError => e
+  end 
 end