fixup I84cdc5dcb8626d2cc1d18f963a8d6fdf4c99da6a

using self.getOption('always') instead of self.options['always']

Change-Id: Ie27946d546425b048cadea8a6ce0bd07b891bc91