Replaced NPE with RuntimeException and message