Revert "Added Error messages, before the error is thrown"

This reverts commit 628c48631c9e340ecd49cada425626d82debe4de.