Fix namespaces
Check against null
Assembly streaming can fail if deletion is not consistent