catch exception
Merge branch 'master' of https://github.com/larspeeters/FeedMeMore

Conflicts:
	scripts/login.php