diff --git a/admin/roles/assign.html b/admin/roles/assign.html
index d50a9461f0e..37e6dd542a2 100755
--- a/admin/roles/assign.html
+++ b/admin/roles/assign.html
@@ -5,7 +5,7 @@
 if ($userid) {
     print ('<input type="hidden" name="userid" value="'.$userid.'"/>');
 }
-if ($course->id) {
+if ($courseid) {
     print ('<input type="hidden" name="courseid" value="'.$courseid.'" />');
 }
 ?>
diff --git a/admin/roles/override.html b/admin/roles/override.html
index f4a46030212..c5cfc89f3c2 100755
--- a/admin/roles/override.html
+++ b/admin/roles/override.html
@@ -1,11 +1,11 @@
-             <form action="override.php" method="post">     
+            <form action="override.php" method="post">     
             <input type="hidden" name="contextid" value="<?php echo $contextid; ?>">
             <input type="hidden" name="roleid" value="<?php echo $roleid; ?>">
 <?php
 if ($userid) {
     print ('<input type="hidden" name="userid" value="'.$userid.'"/>');
 }
-if ($course->id) {
+if ($courseid) {
     print ('<input type="hidden" name="courseid" value="'.$courseid.'" />');
 }?>
             <table class="override">
diff --git a/admin/roles/override.php b/admin/roles/override.php
index a10888a0606..1497eea3913 100755
--- a/admin/roles/override.php
+++ b/admin/roles/override.php
@@ -139,21 +139,20 @@
       **************************************/
 
     if ($roleid) {
-     
-          // this is the array holding capabilities of this role sorted till this context
+        // This is the array holding capabilities of this role sorted till this context
         $r_caps = role_context_capabilities($roleid, $context);
-      
-        // this is the available capabilities assignable in this context
-        $capabilities = fetch_context_capabilities($context);
         
-        print_simple_box_start("center");
-    
-        include_once('override.html');
-
-        print_simple_box_end();
-
+        // Get the capabilities assignable in this context
+        if ($capabilities = fetch_context_capabilities($context)) {
+            print_simple_box_start("center");
+            include_once('override.html');
+            print_simple_box_end();
+        } else {
+            notice(get_string('nocapabilitiesincontext', 'moodle'),
+                    $CFG->wwwroot.'/admin/roles/override.php?contextid='.$contextid);
+        }
     }
     
     print_footer($course);
     
-?>
+?>
\ No newline at end of file