added return statement to message handlers