Fixes power draw not being processed if no power was available

Should address some of the issues raised in Pull Request #6080