* Added printing of called URL in error messages
* Tidyed up code a tad
Related to #10