Add check in Context creation