Web Profiler module breaks shortcut module

When attempting to add a new shortcut to the shortcut bar, the following error is printed if the web profiler is enabled. If it is disabled, adding shortcuts works as expected.

[Tue Jan 05 15:10:34.527566 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP Fatal error:  Call to a member function getShortcuts() on null in /var/www/case-studies/site/web/core/modules/shortcut/shortcut.module on line 262
[Tue Jan 05 15:10:34.527598 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP Stack trace:
[Tue Jan 05 15:10:34.527607 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP   1. {main}() /var/www/case-studies/site/web/index.php:0
[Tue Jan 05 15:10:34.527614 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP   2. Drupal\\Core\\DrupalKernel->handle() /var/www/case-studies/site/web/index.php:19
[Tue Jan 05 15:10:34.527620 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP   3. Stack\\StackedHttpKernel->handle() /var/www/case-studies/site/web/core/lib/Drupal/Core/DrupalKernel.php:637
[Tue Jan 05 15:10:34.527626 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP   4. Drupal\\Core\\StackMiddleware\\NegotiationMiddleware->handle() /var/www/case-studies/site/vendor/stack/builder/src/Stack/StackedHttpKernel.php:23
[Tue Jan 05 15:10:34.527633 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP   5. Drupal\\webprofiler\\StackMiddleware\\WebprofilerMiddleware->handle() /var/www/case-studies/site/web/core/lib/Drupal/Core/StackMiddleware/NegotiationMiddleware.php:55
[Tue Jan 05 15:10:34.527639 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP   6. Drupal\\Core\\StackMiddleware\\ReverseProxyMiddleware->handle() /var/www/case-studies/site/web/modules/contrib/devel/webprofiler/src/StackMiddleware/WebprofilerMiddleware.php:42
[Tue Jan 05 15:10:34.527645 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP   7. Drupal\\page_cache\\StackMiddleware\\PageCache->handle() /var/www/case-studies/site/web/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php:51
[Tue Jan 05 15:10:34.527651 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP   8. Drupal\\page_cache\\StackMiddleware\\PageCache->pass() /var/www/case-studies/site/web/core/modules/page_cache/src/StackMiddleware/PageCache.php:82
[Tue Jan 05 15:10:34.527657 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP   9. Drupal\\Core\\StackMiddleware\\KernelPreHandle->handle() /var/www/case-studies/site/web/core/modules/page_cache/src/StackMiddleware/PageCache.php:103
[Tue Jan 05 15:10:34.527663 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  10. Drupal\\Core\\StackMiddleware\\Session->handle() /var/www/case-studies/site/web/core/lib/Drupal/Core/StackMiddleware/KernelPreHandle.php:53
[Tue Jan 05 15:10:34.527677 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  11. Symfony\\Component\\HttpKernel\\HttpKernel->handle() /var/www/case-studies/site/web/core/lib/Drupal/Core/StackMiddleware/Session.php:62
[Tue Jan 05 15:10:34.527683 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  12. Symfony\\Component\\HttpKernel\\HttpKernel->handleRaw() /var/www/case-studies/site/vendor/symfony/http-kernel/HttpKernel.php:62
[Tue Jan 05 15:10:34.527690 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  13. Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcher->dispatch() /var/www/case-studies/site/vendor/symfony/http-kernel/HttpKernel.php:144
[Tue Jan 05 15:10:34.527696 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  14. Drupal\\Component\\EventDispatcher\\ContainerAwareEventDispatcher->dispatch() /var/www/case-studies/site/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php:124
[Tue Jan 05 15:10:34.527703 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  15. Symfony\\Component\\EventDispatcher\\Debug\\WrappedListener->__invoke() /var/www/case-studies/site/web/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php:116
[Tue Jan 05 15:10:34.527841 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  16. call_user_func:{/var/www/case-studies/site/vendor/symfony/event-dispatcher/Debug/WrappedListener.php:61}() /var/www/case-studies/site/vendor/symfony/event-dispatcher/Debug/WrappedListener.php:61
[Tue Jan 05 15:10:34.527848 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  17. Drupal\\Core\\EventSubscriber\\MainContentViewSubscriber->onViewRenderArray() /var/www/case-studies/site/vendor/symfony/event-dispatcher/Debug/WrappedListener.php:61
[Tue Jan 05 15:10:34.527853 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  18. Drupal\\Core\\Render\\MainContent\\HtmlRenderer->renderResponse() /var/www/case-studies/site/web/core/lib/Drupal/Core/EventSubscriber/MainContentViewSubscriber.php:95
[Tue Jan 05 15:10:34.527859 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  19. Drupal\\Core\\Render\\Renderer->executeInRenderContext() /var/www/case-studies/site/web/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php:153
[Tue Jan 05 15:10:34.527865 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  20. Drupal\\Core\\Render\\MainContent\\HtmlRenderer->Drupal\\Core\\Render\\MainContent\\{closure}() /var/www/case-studies/site/web/core/lib/Drupal/Core/Render/Renderer.php:577
[Tue Jan 05 15:10:34.527871 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  21. Drupal\\Core\\Render\\Renderer->render() /var/www/case-studies/site/web/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php:152
[Tue Jan 05 15:10:34.527876 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  22. Drupal\\Core\\Render\\Renderer->doRender() /var/www/case-studies/site/web/core/lib/Drupal/Core/Render/Renderer.php:200
[Tue Jan 05 15:10:34.527882 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  23. Drupal\\Core\\Theme\\ThemeManager->render() /var/www/case-studies/site/web/core/lib/Drupal/Core/Render/Renderer.php:438
[Tue Jan 05 15:10:34.527887 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  24. twig_render_template() /var/www/case-studies/site/web/core/lib/Drupal/Core/Theme/ThemeManager.php:389
[Tue Jan 05 15:10:34.527892 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  25. Twig_Template->render() /var/www/case-studies/site/web/core/themes/engines/twig/twig.engine:61
[Tue Jan 05 15:10:34.527897 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  26. Twig_Template->display() /var/www/case-studies/site/vendor/twig/twig/lib/Twig/Template.php:366
[Tue Jan 05 15:10:34.527903 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  27. Twig_Template->displayWithErrorHandling() /var/www/case-studies/site/vendor/twig/twig/lib/Twig/Template.php:355
[Tue Jan 05 15:10:34.527908 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  28. __TwigTemplate_0678b7a259d6431a59ff0495dd2157df3aa334dbb3e3fd27175964351eef6426->doDisplay() /var/www/case-studies/site/vendor/twig/twig/lib/Twig/Template.php:381
[Tue Jan 05 15:10:34.527918 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  29. Drupal\\Core\\Template\\TwigExtension->escapeFilter() /var/www/case-studies/site/vendor/twig/twig/lib/Twig/Environment.php(403) : eval()'d code:87
[Tue Jan 05 15:10:34.527924 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  30. Drupal\\Core\\Render\\Renderer->render() /var/www/case-studies/site/web/core/lib/Drupal/Core/Template/TwigExtension.php:466
[Tue Jan 05 15:10:34.527929 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  31. Drupal\\Core\\Render\\Renderer->doRender() /var/www/case-studies/site/web/core/lib/Drupal/Core/Render/Renderer.php:200
[Tue Jan 05 15:10:34.527935 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  32. Drupal\\Core\\Render\\Renderer->doRender() /var/www/case-studies/site/web/core/lib/Drupal/Core/Render/Renderer.php:451
[Tue Jan 05 15:10:34.527940 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  33. call_user_func:{/var/www/case-studies/site/web/core/lib/Drupal/Core/Render/Renderer.php:384}() /var/www/case-studies/site/web/core/lib/Drupal/Core/Render/Renderer.php:384
[Tue Jan 05 15:10:34.527945 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  34. Drupal\\toolbar\\Element\\Toolbar::preRenderToolbar() /var/www/case-studies/site/web/core/lib/Drupal/Core/Render/Renderer.php:384
[Tue Jan 05 15:10:34.527950 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  35. Drupal\\Core\\Extension\\ModuleHandler->invokeAll() /var/www/case-studies/site/web/core/modules/toolbar/src/Element/Toolbar.php:86
[Tue Jan 05 15:10:34.527955 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  36. call_user_func_array:{/var/www/case-studies/site/web/core/lib/Drupal/Core/Extension/ModuleHandler.php:393}() /var/www/case-studies/site/web/core/lib/Drupal/Core/Extension/ModuleHandler.php:393
[Tue Jan 05 15:10:34.527961 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  37. shortcut_toolbar() /var/www/case-studies/site/web/core/lib/Drupal/Core/Extension/ModuleHandler.php:393
[Tue Jan 05 15:10:34.527965 2016] [:error] [pid 32331] [client 192.168.4.131:61631] PHP  38. shortcut_renderable_links() /var/www/case-studies/site/web/core/modules/shortcut/shortcut.module:387
[Tue Jan 05 15:13:37.932684 2016] [:error] [pid 31759] [client 192.168.4.131:63128] Recoverable fatal error: Argument 2 passed to Drupal\\shortcut\\ShortcutAccessControlHandler::__construct() must implement interface Drupal\\shortcut\\ShortcutSetStorageInterface, instance of Drupal\\webprofiler\\Entity\\EntityStorageDecorator given, called in /var/www/case-studies/site/web/core/modules/shortcut/src/ShortcutAccessControlHandler.php on line 52 and defined in /var/www/case-studies/site/web/core/modules/shortcut/src/ShortcutAccessControlHandler.php on line 40, referer: http://case-studies.dev/admin/config/user-interface/shortcut/manage/default/customize