DD - Fixes null pointer error from switch statement.