Clientside error fix