null checks added for battery monitor plugin