Move interrupted check lower in NonIncrementalSolver to avoid race conditions

Created by: jad-hamza

@samarion I'm moving the interrupt check a bit later to avoid the case where we could get interrupted right after the if check.