#28: Added exception to custom url loader and refactored url loader