Add a warning log type
Clean up, remove extra logging, handle another error properly