diff --git a/src/Blob/BlobRestProxy.php b/src/Blob/BlobRestProxy.php
index 6398c2935..823a051bd 100644
--- a/src/Blob/BlobRestProxy.php
+++ b/src/Blob/BlobRestProxy.php
@@ -195,6 +195,10 @@ private function _getBlobUrl($container, $blob)
             $encodedBlob = $container . '/' . $encodedBlob;
         }
         
+        if (substr($encodedBlob, 0, 1) != '/' && substr($this->getUri(), -1, 1) != '/')
+        {
+            $encodedBlob =  '/' .  $encodedBlob;
+        }
         return $this->getUri() . $encodedBlob;
     }
     
@@ -1352,11 +1356,13 @@ public function createBlockBlob($container, $blob, $content, $options = null)
                         $content = substr_replace($content, '', 0, $blockSize);
                     }
                 }
-                $block = new Block();
-                $block->setBlockId(base64_encode(str_pad($counter++, 6, '0', STR_PAD_LEFT)));
-                $block->setType('Uncommitted');
-                array_push($blockIds, $block);
-                $this->createBlobBlock($container, $blob, $block->getBlockId(), $body);
+                if (!empty($body)) {
+                    $block = new Block();
+                    $block->setBlockId(base64_encode(str_pad($counter++, 6, '0', STR_PAD_LEFT)));
+                    $block->setType('Uncommitted');
+                    array_push($blockIds, $block);
+                    $this->createBlobBlock($container, $blob, $block->getBlockId(), $body);
+                }
             }
             $response = $this->commitBlobBlocks($container, $blob, $blockIds, $options);
         }