Who needs exceptions...
Minor changes