Few error checks remaining