Add guard clause around message length