Bring back responsiveness of context, and handle it not being there