Error handling and cleanup

git-svn-id: https://plugins.svn.wordpress.org/islamsource/trunk@1055809 b8457f37-d9ea-0310-8a92-e5e31aec5664