1.1 Extend

Fixes for null reference