Did some more error checking, need robustness tests