0.5.0 java.lang.NullPointerException workaround
Orphaned blocks workaround