diff --git a/lib/youtube_addy.rb b/lib/youtube_addy.rb
index b927640..96195f0 100644
--- a/lib/youtube_addy.rb
+++ b/lib/youtube_addy.rb
@@ -20,20 +20,28 @@ def self.extract_video_id(youtube_url)
       match = format_regex.match(youtube_url)
       return match[:id] if match
     end
+    
+    return 
   end
 
   def self.youtube_embed_url(youtube_url, width = 420, height = 315)
     vid_id = extract_video_id(youtube_url)
-    %(<iframe width="#{width}" height="#{height}" src="http://www.youtube.com/embed/#{vid_id}" frameborder="0" allowfullscreen></iframe>)
+    return unless vid_id
+    
+    %(<iframe width="#{width}" height="#{height}" src="https://www.youtube.com/embed/#{vid_id}" frameborder="0" allowfullscreen></iframe>)
   end
 
   def self.youtube_regular_url(youtube_url)
     vid_id = extract_video_id(youtube_url)
-    "http://www.youtube.com/watch?v=#{ vid_id }"
+    return unless vid_id
+    
+    "https://www.youtube.com/watch?v=#{ vid_id }"
   end
 
   def self.youtube_shortened_url(youtube_url)
     vid_id = extract_video_id(youtube_url)
-    "http://youtu.be/#{ vid_id }"
+    return unless vid_id
+    
+    "https://youtu.be/#{ vid_id }"
   end
 end