Fixed crashes with 1.7.2
Merge branch '1.7.2' of https://github.com/Dramentiaras/copious-dogs into 1.7.2