Cherry picked another commit from RK with crash problem (Crashlytics issue #10)