Fix for issue when buying without SIM card causes NPE

Hi,

Reverted that commit you were talking about.