Minor change in error handling