Prepare for better error handling