Some improvements in performance and less Exceptions (yes, less!)