Some error fixes

For 1.8 better functionality, accompanies https://github.com/CitizensDev/CitizensAPI/pull/8