CLOUDSTACK-7583: Fix NPE caused by previous commit