removed unecessary error check