Stop service from crashing
Removed unnecessary stuff
Make sure we always show the unlock number!