Not crashing anymore

Hallelujah!