Added test to prevent fatal error in certain error conditions
Added test to prevent fatal error in certain error conditions

tomsommer/Fetch,kevinsmith/Fetch,benr77/Fetch,benr77/Fetch,ApexWire/Fetch,RewardGateway/Fetch,RewardGateway/Fetch,muxx/Fetch,ApexWire/Fetch,dharyk/Fetch,dharyk/Fetch,kevinsmith/Fetch,rbridge/Fetch,rbridge/Fetch,muxx/Fetch,deemyboy/Fetch,deemyboy/Fetch,Mika56/Fetch,Mika56/Fetch,tomsommer/Fetch