Remove throws NullPointerException
Revert "Remove throws NullPointerException"

This reverts commit 26a7f944e84fa6e024a5cea58fbab64dff207da2.
Revert "Revert "Remove throws NullPointerException""

This reverts commit b4aa34a22fd426d639c6d9722efabd2d269cf13c.
Bug of GitHub