Fix for null pointer (context is injected now)