Added check to make sure exceptions aren't raised