removed unexistant tag
better error handling