[Issue 40] Fixes a null pointer when using CrossContext without MVCSContext