Removed stupid exception throwing
More stupid exception throwing has been removed