fix for NotificationSubscriptionDAO, nullpointers, commandSubscriptionDAO