More cleanups and error checking.
More cleanups and error checking.

moypray/flocker,Azulinho/flocker,runcom/flocker,jml/flocker,lukemarsden/flocker,Azulinho/flocker,agonzalezro/flocker,1d4Nf6/flocker,hackday-profilers/flocker,lukemarsden/flocker,mbrukman/flocker,w4ngyi/flocker,wallnerryan/flocker-profiles,runcom/flocker,1d4Nf6/flocker,hackday-profilers/flocker,mbrukman/flocker,w4ngyi/flocker,wallnerryan/flocker-profiles,LaynePeng/flocker,w4ngyi/flocker,AndyHuu/flocker,jml/flocker,agonzalezro/flocker,AndyHuu/flocker,lukemarsden/flocker,mbrukman/flocker,achanda/flocker,wallnerryan/flocker-profiles,AndyHuu/flocker,hackday-profilers/flocker,adamtheturtle/flocker,agonzalezro/flocker,LaynePeng/flocker,adamtheturtle/flocker,LaynePeng/flocker,adamtheturtle/flocker,runcom/flocker,achanda/flocker,Azulinho/flocker,achanda/flocker,moypray/flocker,1d4Nf6/flocker,jml/flocker,moypray/flocker