Update better logging
Update better error logging