Added gen_server guards
Fix