diff --git a/mod/wiki/files.php b/mod/wiki/files.php
index fe92ac5fb5d..377ed741afb 100644
--- a/mod/wiki/files.php
+++ b/mod/wiki/files.php
@@ -49,11 +49,6 @@ if ($wid) {
         print_error('incorrectwikiid', 'wiki');
     }
     if (!$subwiki = wiki_get_subwiki_by_group($wiki->id, $currentgroup, $userid)) {
-        // trap anomalous parameters that would lead to a shared subwiki being created for an individual user
-        if ($wiki->wikimode == 'individual' && $userid == 0) {
-            throw new coding_exception('Tried creating a shared subwiki in \'individual\' mode. This shouldn\'t happen.');
-        }
-
         // create subwiki if doesn't exist
         $subwikiid = wiki_add_subwiki($wiki->id, $currentgroup, $userid);
         $subwiki = wiki_get_subwiki($subwikiid);
diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php
index 241f6f53907..af43a12f555 100644
--- a/mod/wiki/pagelib.php
+++ b/mod/wiki/pagelib.php
@@ -947,11 +947,6 @@ class page_wiki_create extends page_wiki {
             $groupid = '0';
         }
         if (empty($this->subwiki)) {
-            // trap anomalous parameters that would lead to a shared subwiki being created for an individual user
-            if ($PAGE->activityrecord->wikimode == 'individual' && $this->uid == 0) {
-                throw new coding_exception('Tried creating a shared subwiki in \'individual\' mode. This shouldn\'t happen.');
-            }
-
             // If subwiki is not set then try find one and set else create one.
             if (!$this->subwiki = wiki_get_subwiki_by_group($this->wid, $groupid, $this->uid)) {
                 $swid = wiki_add_subwiki($PAGE->activityrecord->id, $groupid, $this->uid);
diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index fbfb3e0b694..9f7b8081ebf 100644
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -68,6 +68,8 @@ if ($id) {
     // Checking course instance
     $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
 
+    require_login($course, true, $cm);
+
     // Checking wiki instance
     if (!$wiki = wiki_get_wiki($cm->instance)) {
         print_error('incorrectwikiid', 'wiki');
@@ -138,6 +140,7 @@ if ($id) {
     // Checking course instance
     $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
 
+    require_login($course, true, $cm);
     /*
      * Case 2:
      *
@@ -166,9 +169,9 @@ if ($id) {
     }
 
     // Checking course instance
-    if (!$course = $DB->get_record("course", array("id" => $cm->course))) {
-        print_error('coursemisconf');
-    }
+    $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
+
+    require_login($course, true, $cm);
 
     $groupmode = groups_get_activity_groupmode($cm);
 
@@ -267,7 +270,6 @@ if ($id) {
 } else {
     print_error('incorrectparameters');
 }
-require_login($course, true, $cm);
 
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/wiki:viewpage', $context);