Added null check (was in outer method before)
Merge branch 'master' into structrdb-master