Add null checks for reload and stop