Added/Commented out an exception in the constructor instead of return.