diff --git a/Library/Homebrew/cask/lib/hbc/installer.rb b/Library/Homebrew/cask/lib/hbc/installer.rb
index 47bb770261..b77bf6ee1f 100644
--- a/Library/Homebrew/cask/lib/hbc/installer.rb
+++ b/Library/Homebrew/cask/lib/hbc/installer.rb
@@ -152,17 +152,17 @@ module Hbc
           Container.for_path(@downloaded_path)
         end
 
-        container&.new(@cask, @downloaded_path, @command, verbose: verbose?)
+        unless container
+          raise CaskError, "Uh oh, could not figure out how to unpack '#{@downloaded_path}'."
+        end
+
+        container.new(@cask, @downloaded_path, @command, verbose: verbose?)
       end
     end
 
     def extract_primary_container
       odebug "Extracting primary container"
 
-      unless primary_container
-        raise CaskError, "Uh oh, could not figure out how to unpack '#{@downloaded_path}'"
-      end
-
       odebug "Using container class #{primary_container.class} for #{@downloaded_path}"
       FileUtils.mkdir_p @cask.staged_path
       primary_container.extract