FIXED: Added option to not trigger error