Better error Handling
Better error logging