Added NoneType guards.

*Also added additional logging as well as adb output controls