Relocated the throw of an exception, it caused an execution of some code to skip.