Fix NullReferenceException - fixes #1307 #1308
Fix NullReferenceException - fixes #1307 #1308

baronfel/Paket,Thorium/Paket,simonhdickson/Paket,vbfox/Paket,artur-s/Paket,lexarchik/Paket,cloudRoutine/Paket,vasily-kirichenko/Paket,antymon4o/Paket,snowcrazed/Paket,magicmonty/Paket,thinkbeforecoding/Paket,sergey-tihon/Paket,robertpi/Paket,snowcrazed/Paket,magicmonty/Paket,simonhdickson/Paket,baronfel/Paket,lexarchik/Paket,simonhdickson/Paket,vbfox/Paket,MorganPersson/Paket,cloudRoutine/Paket,vasily-kirichenko/Paket,jam40jeff/Paket,MorganPersson/Paket,mrinaldi/Paket,isaacabraham/Paket,snowcrazed/Paket,NatElkins/Paket,matthid/Paket,isaacabraham/Paket,Stift/Paket,fsprojects/Paket,cloudRoutine/Paket,inosik/Paket,MorganPersson/Paket,magicmonty/Paket,fsprojects/Paket,thinkbeforecoding/Paket,matthid/Paket,robertpi/Paket,mrinaldi/Paket,robertpi/Paket,0x53A/Paket,antymon4o/Paket,matthid/Paket,Stift/Paket,NatElkins/Paket,magicmonty/Paket,lexarchik/Paket,cloudRoutine/Paket,isaacabraham/Paket,isaacabraham/Paket,snowcrazed/Paket,jam40jeff/Paket,lexarchik/Paket,mrinaldi/Paket,NatElkins/Paket,robertpi/Paket,Thorium/Paket,Thorium/Paket,MorganPersson/Paket,colinbull/Paket,artur-s/Paket,0x53A/Paket,simonhdickson/Paket,matthid/Paket,thinkbeforecoding/Paket,vbfox/Paket,inosik/Paket,Thorium/Paket,theimowski/Paket,NatElkins/Paket,thinkbeforecoding/Paket,sergey-tihon/Paket,vbfox/Paket,0x53A/Paket,theimowski/Paket,Stift/Paket,mrinaldi/Paket,Stift/Paket,colinbull/Paket,0x53A/Paket