Fixed issue where app crashes on null input