More cleanup of error checking and instantiation
More cleanup of error checking and instantiation

dallasmarlow/jetpants,yonglehou/jetpants,tumblr/jetpants,tumblr/jetpants,yonglehou/jetpants,dallasmarlow/jetpants,tumblr/jetpants,tumblr/jetpants,fgbreel/jetpants,fgbreel/jetpants