Removed a dot...
Added some initial exception handling