More awesomeness with error handling and logging