Avoiding strange NPE
Merge origin/master