fixed wording
better exception handling