Add missing Hold check + fix NPE on Have