* Fixed an issue with an uninitialized variable
* Fixed an issue with a variable that did not always exist