some extra null checking
volatile members in Wrapper
travis (again)