Improved Err handling