Removing unused error handler, and adding guardfile