Improving #147

It is probably better to avoid a NPE on the synchronized statement.
4 jobs for master