Pull Request Dev_1.0

please remove the else { since you're already throwing an exception exiting the function when it does.