Avoid NPE
Merge with the master