Fix for ACT-1623: NPE due to order of eventbaseGW