Fix NullPointerException if swapping between MatrixExecutionStrategies