22a050f
Fixed regression from previous commit Additional changes: - commented changes related to discovered static analysis issues - found and fixed possible NULL dereference that was previously not included in static analysis report (false negative?)