=== modified file 'dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/SmsSender.java'
--- dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/SmsSender.java	2013-06-19 18:57:37 +0000
+++ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/SmsSender.java	2013-06-26 07:37:34 +0000
@@ -136,7 +136,7 @@
                 text = createMessage( subject, text, sender );
                 
                 // Bulk is limited in sending long SMS, need to cut into small pieces
-                if ( SmsLibService.gatewayMap.get( "bulk_gw" ).equals( gatewayId ) )
+                if ( SmsLibService.gatewayMap.get( "bulk_gw" )!= null && SmsLibService.gatewayMap.get( "bulk_gw" ).equals( gatewayId ) )
                 {
                     // Check if text contain any specific unicode character
                     for( char each: text.toCharArray())