Fix for STORM-244 DRPC timeout can return null instead of throwing an exception