Added checks for non-emitting of other signals than the one we expect