Update context.cpp to avoid else after return

Update context.cpp to avoid else after return #715