Fix NPE thrown by weevils