Resolved problem with delimiters, little improvements in exceptions' handling