Adding an error_handler and a bit more pod