Minor access violation exception fix
Merge branch 'steven' into development