NPE fixed after restore
Merge branch 'npeFix' of https://github.com/IstiN/android_xcore into dev