[FIX] NPE with Group and Vault. See #438