Avoid creating an Exception when it is not necessary.

Avoid creating an Exception when it is not necessary. #502