Moved exception handling to new parse method