FIx a possible NPE that is logged
Update to version 3.0.0-SNAPSHOT
Make sure we don't use a static catalog as catalogs from one module will spill into others