Removed null check that was causing type error.
Merge branch 'feature/extend-support-subweave' into feature/extend-support-subweave-disable-cerr