Fix startup crash with latest 1.7.2-R0.3-SNAPSHOT builds