Troubleshooting and error handling

edit