Resolved issue with factories and exceptions.