Added --with-pull switch and error checks (golden-guy)