Remove panic and add messages