Fixed NPE bug with custom block physics
Added a failsafe incase the previous error still occurs
Merge branch 'Deathrow'