Dealt with current exceptions.
Now broken, without exceptions thrown. :/
Tidied up.