f35b2f382c
Merge commit '8a27f923eb9dbbe3c2d0184e82d9f1a98f1e4cdc' * commit '8a27f923eb9dbbe3c2d0184e82d9f1a98f1e4cdc': Don't crash in various ways when using backup services too early