Removed unnecessary typecast.
Don't need to call findViewById() again.
Null pointer check, consistent with the rest of the code.

Change-Id: I24c2871be27ef700b52b2f86d891c9929a7e0bed
Signed-off-by: garwedgess <garethwilliams21@gmail.com>