Fix errors when context in None