Fixed message passing to nil
Merge branch 'jonas'