Minor change in exception handling