Can't create an org then space

[nwmac]

Create a new org.
Go to that org
Create a new space

Space create just spins and there is an error in the console log:

core.js:1671 ERROR TypeError: Cannot convert undefined or null to object
    at Function.values (<anonymous>)
    at updateUserMissingRoles (https://127.0.0.1:4200/main.js:50312:35)
    at userReducer (https://127.0.0.1:4200/main.js:50230:20)
    at https://127.0.0.1:4200/main.js:47032:24
    at Array.reduce (<anonymous>)
    at https://127.0.0.1:4200/main.js:47031:44
    at Array.forEach (<anonymous>)
    at https://127.0.0.1:4200/main.js:47029:36
    at requestDataReducer (https://127.0.0.1:4200/main.js:47112:57)
    at combination (https://127.0.0.1:4200/vendor.js:126944:35)
defaultErrorLogger @ core.js:1671

[nwmac]

@richard-cox Can you take a look.

I've create a branch 'create-org-space-fails' with an e2e test that shows this failure.