Minor comment changes and error handling