Fix NullPointerException if swapping between MatrixExecutionStrategies
Merge pull request #9 from JeremyMarshall/master

Fix NullPointerException if swapping between MatrixExecutionStrategies