We don't crash. Ever.
Fixed merge conflict