NPE fix for deadbolt2