added null pointer check
Merge branch 'master' of
https://github.com/ChristophStanik/AndroidWorkshopTest.git

Conflicts:
	Androidworkshop/src/com/example/androidworkshop/MainActivity.java