Add some error raising