fixed #61: NPE due to race condition
Merge branch 'v0.12.x_bugfix' into v0.12.x