error check not needed anymore since last commit