Fix null dereference from empty intent/input

Fix null dereference from empty intent/input #1048