diff --git a/toolbar_region.module b/toolbar_region.module
index a77e74b..e334213 100644
--- a/toolbar_region.module
+++ b/toolbar_region.module
@@ -48,7 +48,8 @@ function toolbar_region_toolbar_alter(&$items) {
   // Build list of all pseudo blocks.
   $pseudo_blocks = array();
   foreach ($blocks as $delta => $block) {
-    list($definition, $id) = explode(':', $block->get('plugin'), 2);
+    $plugin = explode(':', $block->get('plugin'));
+    list($definition, $id) = !empty($plugin[2]) ? $plugin[2] : NULL;
     if ('toolbar_region_pseudo_block' == $definition) {
       $pseudo_blocks[$id] = $block;
       unset($blocks[$delta]);
@@ -123,7 +124,7 @@ function toolbar_region_toolbar_alter(&$items) {
           '#heading' => $block->label(),
           'block'    => entity_view($block, 'block'),
         ),
-        '#weight' => $block->weight,
+        '#weight' => $block->getWeight(),
       );
     }
   }