Better handling for empty/too short messages