Fixed two exceptions.