Extra Hotfix: improper null implication for generic type V in HashMap