Fix for the "always throw Exception"

Removed the lines (probably duplicated!?) that would cause an "always throw exception"