diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index dac2620d2..fbe5c1a34 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -24,6 +24,7 @@
  - added: Next and Previous GalleryAlbum links in the GalleryAlbum views
  - fixed: Shop: Variants in dropdown and on page
  - fixed: OLD subscription table still hanging around?
+ - fixed: Shelf
 
 7.5.12
  - skipping this release
diff --git a/lib/WebGUI/Asset/Sku/Product.pm b/lib/WebGUI/Asset/Sku/Product.pm
index a03f93d54..7a32b1219 100644
--- a/lib/WebGUI/Asset/Sku/Product.pm
+++ b/lib/WebGUI/Asset/Sku/Product.pm
@@ -400,7 +400,14 @@ Product.
 
 sub getPrice {
     my $self = shift;
-    return $self->getOptions->{price};
+    if (! keys %{ $self->getOptions} ) {
+        my $variants = $self->getAllCollateral('variantsJSON');
+        return '' unless @{ $variants };
+        return $variants->[0]->{price};
+    }
+    else {
+        return $self->getOptions->{price};
+    }
 }
 
 #-------------------------------------------------------------------
@@ -437,8 +444,14 @@ sub getQuantityAvailable {
 #-------------------------------------------------------------------
 sub getThumbnailUrl {
     my $self = shift;
-    my $store = shift || WebGUI::Storage::Image->get($self->session, $self->get('image1'));
-    return $store->getThumbnailUrl($store->getFiles->[0]);
+    my $store = shift;
+    if (! defined $store and $self->get('image1')) {
+        $store = WebGUI::Storage::Image->get($self->session, $self->get('image1'));
+        return $store->getThumbnailUrl($store->getFiles->[0]);
+    }
+    else {
+        return '';
+    }
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Asset/Wobject/Shelf.pm b/lib/WebGUI/Asset/Wobject/Shelf.pm
index c37079a63..9af0cee12 100644
--- a/lib/WebGUI/Asset/Wobject/Shelf.pm
+++ b/lib/WebGUI/Asset/Wobject/Shelf.pm
@@ -112,8 +112,8 @@ sub view {
 		if (defined $asset) {
 			my $sku = $asset->get;
 			$sku->{url} = $asset->getUrl;
-			$sku->{thumbnailUrl} = $asset->getThumbnailUrl;
-			$sku->{price} = sprintf("%.2f", $asset->getPrice);
+            $sku->{thumbnailUrl} = $asset->getThumbnailUrl;
+            $sku->{price} = sprintf("%.2f", $asset->getPrice);
 			push @skus, $sku;
 		}
 		else {