--- loncom/interface/lonnavmaps.pm	2017/03/08 02:51:08	1.529
+++ loncom/interface/lonnavmaps.pm	2017/07/07 17:04:40	1.531
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.529 2017/03/08 02:51:08 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.531 2017/07/07 17:04:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1691,7 +1691,11 @@ END
     my ($is_ssl,$cdom,$cnum,$hostname);
     if ($ENV{'SERVER_PORT'} == 443) {
         $is_ssl = 1;
-        $hostname = $r->hostname();
+        if ($r) {
+            $hostname = $r->hostname();
+        } else {
+            $hostname = $ENV{'SERVER_NAME'};
+        }
     }
     if ($env{'request.course.id'}) {
         $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -5102,7 +5106,7 @@ sub extractParts {
     my %parts;
 
     # Retrieve part count, if this is a problem
-    if ($self->is_problem()) {
+    if ($self->is_raw_problem()) {
 	my $partorder = &Apache::lonnet::metadata($self->src(), 'partorder');
         my $metadata = &Apache::lonnet::metadata($self->src(), 'packages');