Clean Up

Adds better error message.

Fixed typo.